diff --git a/amd/amd.patch b/amd/amd.patch
index abf71c9b33..4228f3065d 100644
--- a/amd/amd.patch
+++ b/amd/amd.patch
@@ -1,40 +1,43 @@
---- amq/amq.c.orig	Fri Jan 12 23:52:00 2001
-+++ amq/amq.c	Thu Jul  5 10:09:10 2001
-@@ -251,7 +251,9 @@
- 	       mi->mi_up > 0 ? "up" :
- 	       mi->mi_up < 0 ? "starting" : "down");
- 	if (mi->mi_error > 0) {
-+#if !defined(__FreeBSD__)
- 	  extern int sys_nerr;
-+#endif
- 	  if (mi->mi_error < sys_nerr)
- #ifdef HAVE_STRERROR
- 	    printf(" (%s)", strerror(mi->mi_error));
---- hlfsd/hlfsd.h.orig	Fri Jan 12 23:52:03 2001
-+++ hlfsd/hlfsd.h	Thu Jul  5 10:09:37 2001
-@@ -147,7 +147,9 @@
- extern int cache_interval;
- extern int noverify;
- extern int serverpid;
-+#if !defined(__FreeBSD__)
- extern int sys_nerr;
-+#endif
- extern int untab_index(char *username);
- extern am_nfs_fh *root_fhp;
- extern am_nfs_fh root;
---- include/am_defs.h.orig	Tue Feb 12 03:44:22 2002
-+++ include/am_defs.h	Thu Sep 12 08:48:47 2002
-@@ -276,7 +276,7 @@
- /*
-  * Actions to take if <malloc.h> exists.
-  */
--#ifdef HAVE_MALLOC_H
-+#if defined(HAVE_MALLOC_H) && !defined(__FreeBSD__)
- # include <malloc.h>
- #endif /* HAVE_MALLOC_H */
+diff -Naur am-utils-6.0.9.orig/conf/nfs_prot/nfs_prot_freebsd3.h am-utils-6.0.9/conf/nfs_prot/nfs_prot_freebsd3.h
+--- am-utils-6.0.9.orig/conf/nfs_prot/nfs_prot_freebsd3.h	Sat Dec 28 15:49:11 2002
++++ am-utils-6.0.9/conf/nfs_prot/nfs_prot_freebsd3.h	Mon Jan 27 19:26:55 2003
+@@ -54,6 +54,9 @@
+ #ifdef HAVE_NFS_NFS_H
+ # include <nfs/nfs.h>
+ #endif /* HAVE_NFS_NFS_H */
++#ifdef HAVE_NFSCLIENT_NFS_H
++# include <nfsclient/nfs.h>
++#endif /* HAVE_NFSCLIENT_NFS_H */
+ #ifdef	HAVE_UFS_UFS_UFSMOUNT_H
+ # include <ufs/ufs/ufsmount.h>
+ #endif	/* HAVE_UFS_UFS_UFSMOUNT_H */
+diff -Naur am-utils-6.0.9.orig/config.h.in am-utils-6.0.9/config.h.in
+--- am-utils-6.0.9.orig/config.h.in	Sat Jan 25 16:10:26 2003
++++ am-utils-6.0.9/config.h.in	Mon Jan 27 19:25:36 2003
+@@ -657,6 +657,9 @@
+ /* Define to 1 if you have the <nfs/nfs.h> header file. */
+ #undef HAVE_NFS_NFS_H
  
---- hlfsd/stubs.c.orig	Tue Feb 12 01:15:17 2002
-+++ hlfsd/stubs.c	Thu Sep 12 09:51:03 2002
++/* Define if you have the <nfsclient/nfs.h> header file. */
++#undef HAVE_NFSCLIENT_NFS_H
++
+ /* Define to 1 if you have the <nfs/nfs_mount.h> header file. */
+ #undef HAVE_NFS_NFS_MOUNT_H
+ 
+diff -Naur am-utils-6.0.9.orig/configure am-utils-6.0.9/configure
+--- am-utils-6.0.9.orig/configure	Sat Jan 25 16:10:25 2003
++++ am-utils-6.0.9/configure	Mon Jan 27 19:23:46 2003
+@@ -13042,6 +13042,7 @@
+ 	nfs/export.h			\
+ 	nfs/mount.h			\
+ 	nfs/nfs.h			\
++    nfsclient/nfs.h			\
+ 	nfs/nfs_clnt.h			\
+ 	nfs/nfs_gfs.h			\
+ 	nfs/nfs_mount.h			\
+diff -Naur am-utils-6.0.9.orig/hlfsd/stubs.c am-utils-6.0.9/hlfsd/stubs.c
+--- am-utils-6.0.9.orig/hlfsd/stubs.c	Sat Dec 28 15:49:22 2002
++++ am-utils-6.0.9/hlfsd/stubs.c	Mon Jan 27 19:35:01 2003
 @@ -133,7 +133,7 @@
      res.ns_u.ns_attr_u = rootfattr;
    } else if (eq_fh(argp, &slink)) {
@@ -53,37 +56,15 @@
        /*
         * This code is needed to defeat Solaris 2.4's (and newer) symlink
         * values cache.  It forces the last-modified time of the symlink to be
---- configure.orig	Tue Jun 25 02:32:23 2002
-+++ configure	Tue Jan 14 14:16:27 2003
-@@ -11846,6 +11846,7 @@
- 	nfs/export.h			\
- 	nfs/mount.h			\
- 	nfs/nfs.h			\
-+	nfsclient/nfs.h			\
- 	nfs/nfs_clnt.h			\
- 	nfs/nfs_gfs.h			\
- 	nfs/nfs_mount.h			\
---- config.h.in.orig	Tue Jun 25 02:32:24 2002
-+++ config.h.in	Tue Jan 14 14:15:19 2003
-@@ -652,6 +652,9 @@
- /* Define if you have the <nfs/nfs.h> header file. */
- #undef HAVE_NFS_NFS_H
- 
-+/* Define if you have the <nfsclient/nfs.h> header file. */
-+#undef HAVE_NFSCLIENT_NFS_H
-+
- /* Define if you have the <nfs/nfs_mount.h> header file. */
- #undef HAVE_NFS_NFS_MOUNT_H
+diff -Naur am-utils-6.0.9.orig/include/am_defs.h am-utils-6.0.9/include/am_defs.h
+--- am-utils-6.0.9.orig/include/am_defs.h	Sat Dec 28 15:49:23 2002
++++ am-utils-6.0.9/include/am_defs.h	Mon Jan 27 09:57:05 2003
+@@ -276,7 +276,7 @@
+ /*
+  * Actions to take if <malloc.h> exists.
+  */
+-#ifdef HAVE_MALLOC_H
++#if defined(HAVE_MALLOC_H) && !defined(__FreeBSD__)
+ # include <malloc.h>
+ #endif /* HAVE_MALLOC_H */
  
---- conf/nfs_prot/nfs_prot_freebsd3.h.orig	Wed Jan 30 01:28:49 2002
-+++ conf/nfs_prot/nfs_prot_freebsd3.h	Tue Jan 14 14:34:46 2003
-@@ -54,6 +54,9 @@
- #ifdef HAVE_NFS_NFS_H
- # include <nfs/nfs.h>
- #endif /* HAVE_NFS_NFS_H */
-+#ifdef HAVE_NFSCLIENT_NFS_H
-+# include <nfsclient/nfs.h>
-+#endif /* HAVE_NFSCLIENT_NFS_H */
- #ifdef	HAVE_UFS_UFS_UFSMOUNT_H
- # include <ufs/ufs/ufsmount.h>
- #endif	/* HAVE_UFS_UFS_UFSMOUNT_H */
diff --git a/amd/amd.spec b/amd/amd.spec
index 68be02ccac..b77707c8a8 100644
--- a/amd/amd.spec
+++ b/amd/amd.spec
@@ -32,8 +32,8 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [BASE]
 Group:        System
 License:      BSD
-Version:      6.0.8
-Release:      20030114
+Version:      6.0.9
+Release:      20030127
 
 #   list of sources
 Source0:      ftp://ftp.am-utils.org/pub/am-utils/am-utils-%{version}.tar.gz
@@ -68,7 +68,7 @@ AutoReqProv:  no
 
 %prep
     %setup -q -n am-utils-%{version}
-    %patch -p0
+    %patch -p1
 
 %build
     #   disable system LDAP support because it makes trouble (at least under Solaris 9)