diff --git a/.cvsignore b/.cvsignore
index 4bb62c0..d35f7d2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-am-utils-6.0.6.tar.gz
+am-utils-6.0.7.tar.gz
diff --git a/am-utils.spec b/am-utils.spec
index d232a93..340b65a 100644
--- a/am-utils.spec
+++ b/am-utils.spec
@@ -1,7 +1,7 @@
 Summary: Automount utilities including an updated version of Amd.
 Name: am-utils
-Version: 6.0.6
-Release: 3
+Version: 6.0.7
+Release: 4
 License: BSD
 Epoch: 5
 Group: System Environment/Daemons
@@ -11,9 +11,14 @@ 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: db1-devel, openldap-devel
+BuildPrereq: gdbm-devel, hesiod-devel, openldap-devel
+
+# XXX white out some (internal) perl Requires:
+Provides: perl(::etc/global/lostaltmail.conf)
+Provides: perl(::etc/local/lostaltmail.conf)
+Provides: perl(::etc/os/lostaltmail.conf)
+
 Requires: portmap, grep, gawk, findutils
 Prereq: /sbin/install-info, /sbin/chkconfig, grep
 Obsoletes: amd
@@ -31,12 +36,12 @@ mounting and unmounting filesystems.
 
 %prep
 %setup -q
-%patch -p1 -b .nfs3
-autoheader
-autoconf
 
 %build
-%configure --enable-shared --enable-libs="-lnsl -lresolv" --disable-amq-mount
+%configure \
+	--enable-shared \
+	--enable-am-cflags="$RPM_OPT_FLAGS" \
+	--enable-libs="-lnsl -lresolv"
 make
 
 %install
@@ -45,7 +50,6 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d}
 install -m 755 $RPM_SOURCE_DIR/am-utils.sysconf $RPM_BUILD_ROOT/etc/sysconfig/amd
 install -m 755 $RPM_SOURCE_DIR/am-utils.init $RPM_BUILD_ROOT/etc/rc.d/init.d/amd
-strip $RPM_BUILD_ROOT/usr/sbin/* $RPM_BUILD_ROOT/usr/bin/* || :
 gzip -q9f $RPM_BUILD_ROOT/%{_infodir}/*info*
 mkdir -p $RPM_BUILD_ROOT/.automount
 rm -f $RPM_BUILD_ROOT/usr/sbin/ctl-amd
@@ -110,6 +114,21 @@ fi
 %{_libdir}/libamu.so.*.*
 
 %changelog
+* Fri Feb 22 2002 Nalin Dahyabhai <nalin@redhat.com> 6.0.7-4
+- rebuild in new environment
+
+* Sat Jan 26 2002 Jeff Johnson <jbj@redhat.com>
+- add Provides: to white out certain perl Requires:
+
+* Wed Jan 23 2002 Nalin Dahyabhai <nalin@redhat.com> 6.0.7-2
+- rebuild in new environment
+- require gdbm-devel at build-time instead of db1-devel
+
+* Thu Sep  6 2001 Nalin Dahyabhai <nalin@redhat.com> 6.0.7-1
+- update to 6.0.7, fixing EIO on access bugs (#53251)
+- back out nfs3 patch; no longer needed for current kernels
+- don't explicitly strip binaries; let the buildroot policies handle it
+
 * Wed Jul 18 2001 Nalin Dahyabhai <nalin@redhat.com>
 - rebuild
 
diff --git a/sources b/sources
index f8cde62..1555a05 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-090524b535af2cdf01112278c2f697b9  am-utils-6.0.6.tar.gz
+76a95778c5ad1e41699e15f1d668e89e  am-utils-6.0.7.tar.gz