diff --git a/autofs.spec b/autofs.spec
index d8c3f46..05e0ae8 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.4
-%define release 6
+%define release 6.11
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -21,6 +21,13 @@ Patch7: autofs-4.1.4-check-nsswitch-submount.patch
 Patch8: autofs-4.1.3-alt-master-ldap.patch
 Patch9: autofs-4.1.4-check-is-multi.patch
 Patch10: autofs-4.1.4-cache-update-race-fix.patch
+Patch11: autofs-4.1.4-solaris-hosts-in-auto-master.patch
+Patch12: autofs-4.1.4-standalone-nsswitch-plus-ldap-support-stubs.patch
+Patch13: autofs-4.1.4-init-plus-map-support.patch
+Patch15: autofs-4.1.4-key-len-overflow-fix.patch
+Patch17: autofs-4.1.4-multi-map-implied-slash.patch
+Patch19: autofs-4.1.4-parse-sun-malformed-entry.patch
+Patch20: autofs-4.1.4-multimount-duplicate-keys.patch
 
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl
@@ -70,11 +77,18 @@ echo %{version}-%{release} > .version
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch15 -p1
+%patch17 -p1
+%patch19 -p1
+%patch20 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
 %configure
-make initdir=/etc/rc.d/init.d
+make DEBUG=1 initdir=/etc/rc.d/init.d
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -123,6 +137,20 @@ exit 0
 %{_libdir}/autofs/*
 
 %changelog
+* Fri May  6 2005 Jeff Moyer <jmoyer@redhat.com> - 1:4.1.4-6.11
+- Get rid of the patch that "fixes" colon escapes.  It breaks other things.
+- Prune out patches which have become stale.
+- Combine some patches, rename others.
+
+* Tue May  3 2005 Jeff Moyer <jmoyer@redhat.com> - 1:4.1.4-6.10
+- Enforce a colon escape for sources beginning with a slash.
+
+* Fri Apr 29 2005 Jeff Moyer <jmoyer@redhat.com> - 1:4.1.4-6.7
+- Fix overflow of key array with large key lengths.
+
+* Thu Apr 28 2005 Jeff Moyer <jmoyer@redhat.com> - 1:4.1.4-6.1
+- Changes to get the connectathon test sweet to run.
+
 * Tue Apr 26 2005 Jeff Moyer <jmoyer@redhat.com> - 1:4.1.4-6
 - Fix a race between mounting a share and updating the cache in the parent
   process.  If the mount completed first, the parent would not expire the