diff --git a/.cvsignore b/.cvsignore
index 3318aa4..1e0f447 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-am-utils-6.0.4s5.tar.gz
+am-utils-6.0.5.tar.gz
diff --git a/am-utils.init b/am-utils.init
index 0a9037c..9cdb538 100755
--- a/am-utils.init
+++ b/am-utils.init
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Version: 1.3
 #
@@ -16,21 +16,26 @@
 # Source function library.
 . /etc/init.d/functions
 
-. /etc/sysconfig/amd
+# Recover AMDOPTS from /etc/sysconfig/amd.
+if [ -f /etc/sysconfig/amd ] ; then
+	. /etc/sysconfig/amd
+fi
 
 RETVAL=0
+prog=amd
+amd=/usr/sbin/amd
 
 start() {
-	echo -n "Starting amd: "
-	daemon /usr/sbin/amd -F /etc/amd.conf $AMDOPTS
+	echo -n $"Starting $prog: "
+	daemon $amd -F /etc/amd.conf $AMDOPTS $OPTIONS $MOUNTPTS
 	RETVAL=$?
-	echo	
+	echo
 	[ $RETVAL = 0 ] && touch /var/lock/subsys/amd
 	return $RETVAL
 }
 
 stop() {
-	echo -n "Shutting down amd: "
+	echo -n $"Stopping $prog: "
 	delay=5
 	count=10
 	i=1
@@ -53,7 +58,7 @@ stop() {
 	    i=`expr $i + 1`
 	done
 	if [ -n "$is_down" ] ; then
-	    killproc amd
+	    killproc $amd
 	    RETVAL=$?
 	fi
 	[ $RETVAL = 0 ] && rm -f /var/lock/subsys/amd
@@ -70,7 +75,7 @@ case "$1" in
         stop
 	;;
   status)
-	status amd
+	status $amd
 	;;
   restart)
 	stop
@@ -83,10 +88,10 @@ case "$1" in
 	fi
 	;;
   reload)
-	killall -HUP amd
+	action $"Reloading $prog:" killall -HUP $amd
 	;;
   *)
-	echo "Usage: amd {start|stop|status|restart|condrestart|reload}"
+ 	echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
 	exit 1
 esac
 
diff --git a/am-utils.spec b/am-utils.spec
index c335e7d..d195947 100644
--- a/am-utils.spec
+++ b/am-utils.spec
@@ -1,20 +1,21 @@
 Summary: Automount utilities including an updated version of Amd.
 Name: am-utils
-Version: 6.0.4s5
-Release: 8
+Version: 6.0.5
+Release: 1
 Copyright: BSD
-# XXX up serial with 6.0.4 comes out
-Serial: 4
+Epoch: 5
 Group: System Environment/Daemons
-URL: http://www.cs.columbia.edu/~ezk/am-utils/
-Source: ftp://shekel.mcl.cs.columbia.edu/pub/am-utils/snapshots/am-utils-%{version}.tar.gz
+URL: http://am-utils.org/
+Source: ftp://ftp.am-utils.org/pub/am-utils/am-utils-%{version}.tar.gz
 Source1: am-utils.init
 Source2: am-utils.conf
 Source3: am-utils.sysconf
 Source4: am-utils.net.map
+Patch: am-utils-6.0.4-nfs3.patch
 BuildRoot: %{_tmppath}/%{name}-root
+BuildPrereq: openldap-devel
 Requires: portmap, grep, gawk, findutils
-Prereq: /sbin/install-info, /etc/init.d, /sbin/chkconfig, grep
+Prereq: /sbin/install-info, /sbin/chkconfig, grep
 Obsoletes: amd
 
 %description
@@ -30,9 +31,12 @@ mounting and unmounting filesystems.
 
 %prep
 %setup -q
+%patch -p1 -b .nfs3
+autoheader
+autoconf
 
 %build
-%configure --enable-shared --enable-libs=-lnsl --disable-amq-mount
+%configure --enable-shared --enable-libs="-lnsl -lresolv" --disable-amq-mount
 make
 
 %install
@@ -88,6 +92,7 @@ fi
 if [ $1 -ge 1 ]; then
     /sbin/service amd condrestart >/dev/null 2>&1
 fi
+/sbin/ldconfig
 
 %files
 %defattr(-,root,root)
@@ -105,6 +110,36 @@ fi
 /usr/lib/libamu.so.*.*
 
 %changelog
+* Sat Apr  7 2001 Nalin Dahyabhai <nalin@redhat.com>
+- update to 6.0.5
+- remove /net from the default MOUNTPTS
+
+* Tue Mar 13 2001 Nalin Dahyabhai <nalin@redhat.com>
+- use MOUNTPTS when starting
+
+* Fri Mar  2 2001 Nalin Dahyabhai <nalin@redhat.com>
+- rebuild in new environment
+
+* Wed Feb 14 2001 Nalin Dahyabhai <nalin@redhat.com>
+- redo i18n for the init script
+
+* Tue Jan 23 2001 Nalin Dahyabhai <nalin@redhat.com>
+- re-do workaround from advice from the am-utils maintainers
+- redo i18n for the init script
+
+* Sat Jan 20 2001 Nalin Dahyabhai <nalin@redhat.com>
+- work around clash with nfs3_fh definition in 2.4
+
+* Tue Jan 16 2001 Nalin Dahyabhai <nalin@redhat.com>
+- gettextize the init script (#24087)
+
+* Tue Dec 19 2000 Nalin Dahyabhai <nalin@redhat.com>
+- add ldconfig to %%postun
+- chuck the hesiod patch -- new bind-utils doesn't have the support for it
+
+* Fri Sep  8 2000 Nalin Dahyabhai <nalin@redhat.com>
+- rebuild in new environment
+
 * Sat Jul 15 2000 Bill Nottingham <notting@redhat.com>
 - move initscript back
 
diff --git a/am-utils.sysconf b/am-utils.sysconf
index 17c4ff5..ee8b718 100644
--- a/am-utils.sysconf
+++ b/am-utils.sysconf
@@ -1,3 +1,3 @@
+#MOUNTPTS='/net /etc/amd.net'
 ADIR=/.automount
-MOUNTPTS='/net /etc/amd.conf'
 AMDOPTS=
diff --git a/sources b/sources
index 59c6287..b25f556 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a0db733ba2921ed28f74077b038c99bf  am-utils-6.0.4s5.tar.gz
+e56e7b1a1ed34a479defb00507b728cb  am-utils-6.0.5.tar.gz