diff --git a/.cvsignore b/.cvsignore
index a837e77..c21f428 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
 cachefilesd-0.1.tar.bz2
 cachefilesd-0.2.tar.bz2
 cachefilesd-0.3.tar.bz2
+cachefilesd-0.4.tar.bz2
diff --git a/cachefilesd.spec b/cachefilesd.spec
index 4f4deaa..5d47ab5 100644
--- a/cachefilesd.spec
+++ b/cachefilesd.spec
@@ -1,19 +1,17 @@
 Name:           cachefilesd
-Version:        0.3
-Release:        3%{?dist}
+Version:        0.4
+Release:        1%{?dist}
 Summary:        CacheFiles userspace management daemon
 Group:          System Environment/Daemons
 License:        GPL
-URL:  			http://www.redhat.com
+URL:  			http://people.redhat.com/~dhowells/fscache/
+Source0:        http://people.redhat.com/dhowells/fscache/cachefilesd-0.4.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-Source0:        http://people.redhat.com/dhowells/fscache/cachefilesd-0.3.tar.bz2
 BuildRequires: automake, autoconf
 Requires(post): /usr/bin/chkconfig
 Requires(post): /usr/bin/chkconfig
 
-Patch1: cachefilesd-0.3.initd.patch
-
 %description
 The cachefilesd daemon manages the caching files and directory that are
 that are used by network filesystems such a AFS and NFS to  
@@ -21,8 +19,6 @@ do persistent caching to the local disk.
 
 %prep
 %setup -q
-%patch1 -p1
-
 
 %build
 %ifarch s390 s390x
@@ -33,15 +29,6 @@ PIE="-fpie"
 export PIE
 CFLAGS="`echo $RPM_OPT_FLAGS $ARCH_OPT_FLAGS $PIE`"
 
-aclocal
-automake --add-missing
-autoconf
-%configure  \
-	CFLAGS="$CFLAGS" \
-	CPPFLAGS="$DEFINES" \
-	LDFLAGS="-pie" \
-	--prefix=%{buildroot}
-
 make all
 
 
@@ -52,8 +39,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
 mkdir -p %{buildroot}%{_mandir}/{man5,man8}
 make DESTDIR=%{buildroot} install
 
-install -m 644 etc/cachefilesd.conf %{buildroot}%{_sysconfdir}
-install -m 755 etc/cachefilesd.initd %{buildroot}%{_sysconfdir}/rc.d/init.d/cachefilesd
+install -m 644 cachefilesd.conf %{buildroot}%{_sysconfdir}
+install -m 755 cachefilesd.initd %{buildroot}%{_sysconfdir}/rc.d/init.d/cachefilesd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -69,13 +56,16 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS ChangeLog README
+%doc README
 %config(noreplace) %{_sysconfdir}/cachefilesd.conf
-%{_sysconfdir}/rc.d/init.d/cachefilesd
-%{_sbindir}/cachefilesd
+%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/cachefilesd
+/sbin/*
 %{_mandir}/*/*
 
 %changelog
+* Tue Aug  1 2006 David Howells <dhowells@redhat.com> 0.4-1
+- Discard use of autotools
+
 * Tue Aug  1 2006 Steve Dickson <steved@redhat.com> 0.3-3
 - Added URL to source file
 
diff --git a/sources b/sources
index 62bd63a..7a74e22 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6ebca9cb7396762b359e23acf5856772  cachefilesd-0.3.tar.bz2
+8c94eac2ff9f2317f1fe14dae6670420  cachefilesd-0.4.tar.bz2