diff --git a/.cvsignore b/.cvsignore
index d35f7d2..5383eb2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-am-utils-6.0.7.tar.gz
+am-utils-6.0.9.tar.gz
diff --git a/am-utils.spec b/am-utils.spec
index ec6e777..45fa545 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.7
-Release: 9
+Version: 6.0.9
+Release: 2
 License: BSD
 Epoch: 5
 Group: System Environment/Daemons
@@ -11,13 +11,15 @@ Source1: am-utils.init
 Source2: am-utils.conf
 Source3: am-utils.sysconf
 Source4: am-utils.net.map
+Patch: am-utils-gdbm.patch
 BuildRoot: %{_tmppath}/%{name}-root
-BuildPrereq: gdbm-devel, hesiod-devel, openldap-devel
+BuildPrereq: gdbm-devel, hesiod-devel, openldap-devel autoconf
 Requires: portmap, grep, gawk, findutils
 Prereq: /sbin/install-info, /sbin/chkconfig, grep
 Obsoletes: amd
 
 # We need to filter out some perl requirements for now.
+%define _use_internal_dependency_generator 0
 %define __find_requires %{_builddir}/%{name}-%{version}/find-requires
 
 %description
@@ -33,6 +35,9 @@ mounting and unmounting filesystems.
 
 %prep
 %setup -q
+%patch -p1
+autoconf
+
 find_requires=`rpm --eval %%{__find_requires}`
 echo "$find_requires | grep -v lostaltmail.conf" > find-requires
 chmod +x find-requires
@@ -42,22 +47,36 @@ chmod +x find-requires
 	--enable-shared \
 	--enable-am-cflags="$RPM_OPT_FLAGS" \
 	--enable-libs="-lnsl -lresolv"
-make
+make %{?_smp_flags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 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 scripts/redhat-ctl-amd $RPM_BUILD_ROOT/etc/rc.d/init.d/amd
 install -m 755 $RPM_SOURCE_DIR/am-utils.init $RPM_BUILD_ROOT/etc/rc.d/init.d/amd
 gzip -q9f $RPM_BUILD_ROOT/%{_infodir}/*info*
 mkdir -p $RPM_BUILD_ROOT/.automount
 rm -f $RPM_BUILD_ROOT/usr/sbin/ctl-amd
 
+# add symlinks to shared libs
+/sbin/ldconfig -n $RPM_BUILD_ROOT/%{_libdir}
+
 # install the default config and map files
 install -m 600 %{SOURCE2} $RPM_BUILD_ROOT/etc/amd.conf
 install -m 640 %{SOURCE4} $RPM_BUILD_ROOT/etc/amd.net
 
+# We don't build a -devel package.
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libamu.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libamu.la
+
+# We don't include the info directory.
+rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
+
+# Remove the other sample config file.
+rm -f $RPM_BUILD_ROOT/etc/amd.conf-sample
+rm -f $RPM_BUILD_ROOT/etc/lostaltmail.conf-sample
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -102,18 +121,37 @@ fi
 %defattr(-,root,root)
 %doc doc/*.ps AUTHORS BUGS ChangeLog NEWS README* scripts/*-sample
 %dir /.automount
+%{_bindir}/expn
 %{_bindir}/pawd
 %{_sbindir}/*
 %{_mandir}/man[58]/*
+%{_mandir}/man1/expn.1*
 %{_mandir}/man1/pawd.1*
 %config(noreplace) /etc/amd.net
 %config(noreplace) /etc/amd.conf
 %config(noreplace) /etc/sysconfig/amd
 %config /etc/rc.d/init.d/amd
 %{_infodir}/*info*.gz
-%{_libdir}/libamu.so.*.*
+%{_libdir}/libamu.so.*
 
 %changelog
+* Tue Feb 04 2003 Florian La Roche <Florian.LaRoche@redhat.de>
+- add symlink to shared lib
+
+* Fri Jan 31 2003 Nalin Dahyabhai <nalin@redhat.com> 6.0.9-1
+- update to 6.0.9
+- disable RPM's internal dependency calculation so that we can filter out
+  dependencies which are expected to be filled in by the site administrator
+
+* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
+- rebuilt
+
+* Tue Jan  7 2003 Nalin Dahyabhai <nalin@redhat.com> 6.0.8-3
+- rebuild
+
+* Wed Oct 30 2002 Nalin Dahyabhai <nalin@redhat.com> 6.0.8-1
+- update to 6.0.8
+
 * Tue Aug 27 2002 Nalin Dahyabhai <nalin@redhat.com> 6.0.7-9
 - rebuild
 
diff --git a/sources b/sources
index 1555a05..06e241e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-76a95778c5ad1e41699e15f1d668e89e  am-utils-6.0.7.tar.gz
+1e288b8485c09a126e2bea4029602265  am-utils-6.0.9.tar.gz