diff --git a/.cvsignore b/.cvsignore
index cc650ae..bd86c0c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-autofs-4.1.2.tar.bz2
+autofs-4.1.3.tar.bz2
diff --git a/autofs.spec b/autofs.spec
index 582128e..728e3f6 100644
--- a/autofs.spec
+++ b/autofs.spec
@@ -3,8 +3,8 @@
 #
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
-%define version 4.1.2
-%define release 2
+%define version 4.1.3
+%define release 5
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -16,8 +16,11 @@ Patch1: autofs-4.1.0-hesiod-bind.patch
 Patch2: autofs-4.1.0-loop.patch
 Patch3: autofs-4.1.0-auto-master.patch
 Patch4: autofs-4.1.2-init-redhat-only.patch
-Patch7: autofs-4.1.1-get-best-mount.patch
-Patch8: autofs-4.1.2-stripdash.patch
+Patch5: autofs-4.1.3-non-strict-loop-fix.patch
+#Patch7: autofs-4.1.1-get-best-mount.patch
+#Patch8: autofs-4.1.2-stripdash.patch
+Patch12: autofs-4.1.2-option-parsing.patch
+Patch13: autofs-4.1.3-icmp-ping.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl
 Prereq: chkconfig
@@ -55,16 +58,21 @@ inkludera nätfilsystem, CD-ROM, floppydiskar, och så vidare.
 
 %prep
 %setup -q
+echo %{version}-%{release} > .version
 %patch1 -p1 -b .hesiod-bind
 %patch2 -p1 -b .loop
 %patch3 -p1 -b .auto-master
 %patch4 -p1 -b .init-redhat-only
-%patch7 -p1 -b .get-best-mount
-%patch8 -p1 -b .stripdash
+%patch5 -p1 -b .non-strict-loop-fix
+#%patch7 -p1 -b .get-best-mount
+#%patch8 -p1 -b .stripdash
+%patch12 -p1 -b .option-parsing
+%patch13 -p1 -b .imcp-ping
 cp $RPM_SOURCE_DIR/autofs.sysconfig .
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
+#CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
+%configure
 make initdir=/etc/rc.d/init.d
 
 %install
@@ -85,6 +93,18 @@ install -m 644 autofs.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/autofs
 %post
 chkconfig --add autofs
 
+%postun
+if [ $1 -ge 1 ] ; then
+	/sbin/service autofs condrestart > /dev/null 2>&1 || :
+fi
+
+%preun
+if [ "$1" = 0 ] ; then
+	/sbin/service autofs stop > /dev/null 2>&1 || :
+	/sbin/chkconfig --del autofs
+fi
+exit 0
+
 %files
 %defattr(-,root,root)
 %doc CREDITS COPY* README* TODO multiserver_mount.patch patches/* samples/ldap* samples/autofs.schema
@@ -101,6 +121,55 @@ chkconfig --add autofs
 %{_libdir}/autofs/*
 
 %changelog
+* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Sat Jun  5 2004 Jeff Moyer <jmoyer@redhat.com> - 1:4.1.3-4
+- Perform an icmp ping request before rpc_pings, since the rpc clnt_create
+  function has a builtin default timeout of 60 seconds.  This could result
+  in a long delay when a server in a replicated mount setup is down.
+- For non-replicated server entries, ping a host before attempting to mount.
+  (Ian Kent)
+- Change to %configure.
+- Put version-release into .version to allow for automount --version to
+  print exact info.
+- Nuke my get-best-mount patch which always uses the long timeout.  This
+  should no longer be needed.
+- Put name into changelog entries to make them consistent.  Add e:n-v-r
+  into Florian's entry.
+- Stop autofs before uninstalling
+
+* Sat Jun 05 2004 Florian La Roche <Florian.LaRoche@redhat.de> - 1:4.1.3-3
+- add a preun script to remove autofs
+
+* Tue Jun  1 2004 Jeff Moyer <jmoyer@redhat.com> - 1:4.1.3-2
+- Incorporate patch from Ian which fixes an infinite loop seen by those
+  running older versions of the kernel patches (triggered by non-strict mounts
+  being the default).
+
+* Tue Jun  1 2004 Jeff Moyer <jmoyer@redhat.com> - 1:4.1.3-1
+- Update to upstream 4.1.3.
+
+* Thu May  6 2004 Jeff Moyer <jmoyer@redhat.com> - 1:4.1.2-6
+- The lookup_yp module only dealt with YPERR_KEY, all other errors were 
+  treated as success.  As a result, if the ypdomain was not bound, the 
+  subprocess that starts mounts would SIGSEGV.  This is now fixed.
+- Option parsing in the init script was not precise enough, sometimes matching
+  filesystem options to one of --ghost, --timeout, --verbose, or --debug.  
+  The option-parsing patch addresses this issue by making the regexp's much
+  more precise.
+- Ian has rolled a third version of the replicated mount fixes.
+
+* Tue May  4 2004 Jeff Moyer <jmoyer@redhat.com> - 1:4.1.2-5
+- Ian has a new fix for replicated server and multi-mounts.  Updated the 
+  patch for testing.  Still beta.  (Ian Kent)
+
+* Mon May  3 2004 Jeff Moyer <jmoyer@redhat.com> - 1:4.1.2-4
+- Fix broken multi-mounts.  test patch.  (Ian Kent)
+
+* Tue Apr 20 2004 Jeff Moyer <jmoyer@redhat.com> - 1:4.1.2-3
+- Fix a call to spawnl which forgot to specify a lock file. (nphilipp)
+
 * Wed Apr 14 2004  <jmoyer@redhat.com> - 1:4.1.2-2
 - Pass --libdir= to ./configure so we get this right on 64 bit platforms that 
   support backwards compat.
diff --git a/sources b/sources
index fcee962..87f4393 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-276d8b29d76f0cda5cf1c4a6aafd922d  autofs-4.1.2.tar.bz2
+f43a09e94c4bd512ec58ac06e9d42c60  autofs-4.1.3.tar.bz2