diff --git a/am-utils.init b/am-utils.init
index 9cdb538..17a858b 100755
--- a/am-utils.init
+++ b/am-utils.init
@@ -9,9 +9,10 @@
 # config: /etc/amd.conf
 #
 
-# we require the /etc/amd.conf file
-[ -f /etc/amd.conf ] || exit 0
-[ -f /etc/sysconfig/amd ] || exit 0
+# We require the /etc/amd.conf file, but supply it in the package, so it
+# should always be there.
+[ -f /etc/amd.conf ] || exit $?
+[ -f /etc/sysconfig/amd ] || exit $?
 
 # Source function library.
 . /etc/init.d/functions
@@ -76,6 +77,7 @@ case "$1" in
 	;;
   status)
 	status $amd
+	RETVAL=$?
 	;;
   restart)
 	stop
@@ -95,5 +97,4 @@ case "$1" in
 	exit 1
 esac
 
-exit 0
-
+exit $RETVAL
diff --git a/am-utils.spec b/am-utils.spec
index 378595d..d232a93 100644
--- a/am-utils.spec
+++ b/am-utils.spec
@@ -1,8 +1,8 @@
 Summary: Automount utilities including an updated version of Amd.
 Name: am-utils
 Version: 6.0.6
-Release: 2
-Copyright: BSD
+Release: 3
+License: BSD
 Epoch: 5
 Group: System Environment/Daemons
 URL: http://am-utils.org/
@@ -13,7 +13,7 @@ Source3: am-utils.sysconf
 Source4: am-utils.net.map
 Patch: am-utils-6.0.4-nfs3.patch
 BuildRoot: %{_tmppath}/%{name}-root
-BuildPrereq: openldap-devel
+BuildPrereq: db1-devel, openldap-devel
 Requires: portmap, grep, gawk, findutils
 Prereq: /sbin/install-info, /sbin/chkconfig, grep
 Obsoletes: amd
@@ -98,8 +98,8 @@ fi
 %defattr(-,root,root)
 %doc doc/*.ps AUTHORS BUGS ChangeLog NEWS README* scripts/*-sample
 %dir /.automount
-/usr/bin/pawd
-/usr/sbin/*
+%{_bindir}/pawd
+%{_sbindir}/*
 %{_mandir}/man[58]/*
 %{_mandir}/man1/pawd.1*
 %config(noreplace) /etc/amd.net
@@ -107,11 +107,16 @@ fi
 %config(noreplace) /etc/sysconfig/amd
 %config /etc/rc.d/init.d/amd
 %{_infodir}/*info*.gz
-/usr/lib/libamu.so.*
+%{_libdir}/libamu.so.*.*
 
 %changelog
-* Tue Jun 26 2001 Florian La Roche <Florian.LaRoche@redhat.de>
-- change filelist to include link from library major version number
+* Wed Jul 18 2001 Nalin Dahyabhai <nalin@redhat.com>
+- rebuild
+
+* Mon Jun 25 2001 Nalin Dahyabhai <nalin@redhat.com>
+- add BuildPrereq: db1-devel (#44987)
+- use FHS macros
+- return error codes correctly from init script (#44597)
 
 * Tue May 22 2001 Nalin Dahyabhai <nalin@redhat.com>
 - update to 6.0.6
@@ -127,7 +132,7 @@ fi
 - rebuild in new environment
 
 * Wed Feb 14 2001 Nalin Dahyabhai <nalin@redhat.com>
-- redo i18n for the init script
+- redo i18n for the init script (#24082)
 
 * Tue Jan 23 2001 Nalin Dahyabhai <nalin@redhat.com>
 - re-do workaround from advice from the am-utils maintainers