diff --git a/autofs.spec b/autofs.spec
index 05bfe1b..66d76fe 100644
--- a/autofs.spec
+++ b/autofs.spec
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 4.1.3
-%define release 11
+%define release 17
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -23,6 +23,11 @@ Patch15: autofs-4.1.3-rpc-ping.patch
 Patch16: autofs-4.1.3-bad_chdir.patch
 Patch17: autofs-4.1.3-mtab_lock.patch
 Patch18: autofs-4.1.3-ian-map-expiry-1.patch
+Patch19: autofs-4.1.3-disable-direct.patch
+Patch20: autofs-4.1.3-one-auto-master.patch
+Patch21: autofs-4.1.3-signal-race-fix.patch
+Patch22: autofs-4.1.3-sock-leak-fix.patch
+Patch23: autofs-4.1.3-nss.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl
 Prereq: chkconfig
@@ -71,7 +76,12 @@ echo %{version}-%{release} > .version
 %patch15 -p1 -b .rpc-ping
 %patch16 -p1 -b .bad-chdir
 %patch17 -p1 -b .mtab-lock
-%patch18 -p1 -b .map-expiry
+#%patch18 -p1 -b .map-expiry
+%patch19 -p1 -b .disable-direct
+%patch20 -p1 -b .one-auto-master
+%patch21 -p1 -b .signal-race-fix
+%patch22 -p1 -b .sock-leak-fix
+#%patch23 -p1 -b .nss
 cp $RPM_SOURCE_DIR/autofs.sysconfig .
 
 %build
@@ -125,6 +135,33 @@ exit 0
 %{_libdir}/autofs/*
 
 %changelog
+* Tue Aug 31 2004 Jeff Moyer <jmoyer@redhat.com> - 1:4.1.3-17
+- Add patch to support parsing nsswitch.conf to determine map sources.
+- Disable this patch, and Ian's map expiry patch for a FC build.
+
+* Tue Aug 24 2004 Jeff Moyer <jmoyer@redhat.com> - 1:4.1.3-16
+- Version 3 of Ian's map expiry changes.
+
+* Wed Aug 18 2004 Jeff Moyer <jmoyer@redhat.com> - 1:4.1.3-15
+- Fix a socket leak in the rpc_subs, causing mounts to fail since we are 
+  running out of port space fairly quickly.
+
+* Wed Aug 18 2004 Jeff Moyer <jmoyer@redhat.com> - 1:4.1.3-14
+- New map expiry patch from Ian.
+- Fix a couple signal races.  No known problem reports of these, but they
+  are holes, none-the-less.
+
+* Tue Aug 10 2004 Jeff Moyer <jmoyer@redhat.com> - 1:4.1.3-13
+- Only read one auto.master map (instead of concatenating all found sources).
+- Uncomment Ian's experimental mount expiry patch.
+
+* Fri Aug  6 2004 Jeff Moyer <jmoyer@redhat.com> - 1:4.1.3-12
+- Add a sysconfig entry to disable direct map support, and set this to 
+  1 by default.
+- Disable the beta map expiry logic so I can build into a stable distro.
+- Add defaults for all of the sysconfig variables to the init script so 
+  we don't trip over user errors (i.e. deleting /etc/sysconfig/autofs).
+
 * Wed Aug  4 2004 Jeff Moyer <jmoyer@redhat.com> - 1:4.1.3-11
 - Add beta map expiry code for wider testing. (Ian Kent)
 - Fix check for ghosting option.  I forgot to check for it in DAEMONOPTIONS.