diff --git a/autofs.spec b/autofs.spec
index c1896e6..d60ed9a 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 16.2.2
+%define release 18
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -35,6 +35,8 @@ Patch21: autofs-4.1.4-sockopt-len-type.patch
 Patch22: autofs-4.1.4-yp_order-order-type.patch
 Patch23: autofs-4.1.4-ldap-depricated.patch
 Patch24: autofs-4.1.4-underscore_to_dot.patch
+Patch25: autofs-4.1.3-ldap-auto-master.patch
+Patch26: autofs-4.1.4-auto_net-escape-hash.patch
 
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl
@@ -98,7 +100,8 @@ echo %{version}-%{release} > .version
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
-
+%patch25 -p1
+%patch26 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -152,6 +155,12 @@ exit 0
 %{_libdir}/autofs/*
 
 %changelog
+* Tue Apr 11 2006 Ian Kent <ikent@redhat.com> - 1:4.1.4-18
+- Add patch to allow customization of arguments to the
+  autofs-ldap-auto-master program (bz #187525).
+- Add patch to escap "#" characters in exports from auto.net
+  program mount (bz#178304).
+
 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1:4.1.4-16.2.2
 - bump again for double-long bug on ppc(64)