diff --git a/autofs.spec b/autofs.spec
index 2c9220e..76ae3f4 100644
--- a/autofs.spec
+++ b/autofs.spec
@@ -4,14 +4,16 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.0_beta4
-%define release 1
+%define release 2
 Version: %{version}
 Release: %{release}
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}.tar.bz2
-
+Patch0: autofs-5.0.0_beta4-dontstrip-typo.patch
+Patch1: autofs-5.0.0_beta4-v4-dir-cleanup.patch
+Patch2: autofs-5.0.0_beta4-master-map-update.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, bison, flex
 Prereq: chkconfig
@@ -50,12 +52,14 @@ inkludera nätfilsystem, CD-ROM, floppydiskar, och så vidare.
 %prep
 %setup -q
 echo %{version}-%{release} > .version
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
 %configure --disable-mount-locking --enable-ignore-busy
-# OK I need to fix the spelling error.
-make initdir=/etc/rc.d/init.d DONTSCRIP=1
+make initdir=/etc/rc.d/init.d DONTSTRIP=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -106,6 +110,14 @@ exit 0
 %{_libdir}/autofs/*
 
 %changelog
+* Mon Jun 5 2006 Ian Kent <ikent@redhat.com> - 5.0.0_beta4-2
+- re-instate v4 directory cleanup (bz# 193832 again).
+- backout master map lookup changes made to beta3.
+- change default master map from /etc/auto.master to auto.master
+  so that we always use nsswitch to locate master map.
+- change default installed master map to include "+auto.master"
+  to pickup NIS master map (all bz# 193831 again).
+
 * Fri Jun 2 2006 Ian Kent <ikent@redhat.com> - 5.0.0_beta4-1
 - update to beta4.
 - should address at least bzs 193798, 193770, 193831 and