diff --git a/autofs.spec b/autofs.spec
index 66d76fe..ac59aa6 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 17
+%define release 18
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -27,7 +27,9 @@ 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
+#Patch23: autofs-4.1.3-nss.patch
+Patch24: autofs-4.1.3-umount-loopback.patch
+Patch25: autofs-4.1.3-close-fix.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl
 Prereq: chkconfig
@@ -76,12 +78,14 @@ 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
+%patch24 -p1 -b .umount-loopback
+%patch25 -p1 -b .close-fix
 cp $RPM_SOURCE_DIR/autofs.sysconfig .
 
 %build
@@ -135,6 +139,12 @@ exit 0
 %{_libdir}/autofs/*
 
 %changelog
+* Thu Sep  2 2004 Jeff Moyer <jmoyer@redhat.com> - 1:4.1.3-18
+- Umount loopback filesystems under automount points when stopping the 
+  automounter.
+- Uncomment the map expiry patch.
+- change a close to an fclose in lookup_file.c
+
 * 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.