diff --git a/.cvsignore b/.cvsignore
index 14e2878..3d85699 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ocaml-fileutils-0.3.0.tar.gz
+ocaml-fileutils-0.4.0.tar.gz
diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec
index d493b41..ea4ec23 100644
--- a/ocaml-fileutils.spec
+++ b/ocaml-fileutils.spec
@@ -2,14 +2,14 @@
 %define debug_package %{nil}
 
 Name:           ocaml-fileutils
-Version:        0.3.0
-Release:        11%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        OCaml library for common file and filename operations
 
 Group:          Development/Libraries
 License:        LGPLv2 with exceptions
 URL:            http://www.gallu.homelinux.org/download/
-Source0:        http://www.gallu.homelinux.org/download/ocaml-fileutils-0.3.0.tar.gz
+Source0:        http://www.gallu.homelinux.org/download/ocaml-fileutils-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
 
@@ -46,29 +46,26 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
-# The whole build system for this package is totally broken.
-# We build into a temporary directory then copy the files
-# to the right place.
-./configure --prefix=%{_prefix} --libdir=%{_libdir} \
-  --enable-ocamlfind \
-  --with-builddir=`pwd`/tmp
+%configure
 
 
 %build
-# Nothing: 'make' builds and installs.  Stupid!
+make
 
 
 %install
-# Go and do your broken stuff now ...
-rm -rf tmp
-make
-# make doc   (borked)
-
-# ... and copy the files to the right places.
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml
-cp -r tmp/lib/fileutils $RPM_BUILD_ROOT%{_libdir}/ocaml
-rm -rf tmp
+export DESTDIR=$RPM_BUILD_ROOT
+export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
+mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
+
+# Set htmldir to current directory, then copy the docs (in api/)
+# as a %doc rule.
+make htmldir=. install
+
+
+%check
+make test
 
 
 %clean
@@ -81,20 +78,32 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/ocaml/fileutils
 %if %opt
 %exclude %{_libdir}/ocaml/fileutils/*.a
+%exclude %{_libdir}/ocaml/fileutils/*.cmx
 %exclude %{_libdir}/ocaml/fileutils/*.cmxa
 %endif
+%exclude %{_libdir}/ocaml/fileutils/*.ml
+%exclude %{_libdir}/ocaml/fileutils/*.mli
 
 
 %files devel
 %defattr(-,root,root,-)
-%doc COPYING AUTHOR CHANGELOG README TODO
+%doc COPYING AUTHOR CHANGELOG README TODO api
 %if %opt
 %{_libdir}/ocaml/fileutils/*.a
+%{_libdir}/ocaml/fileutils/*.cmx
 %{_libdir}/ocaml/fileutils/*.cmxa
 %endif
+%{_libdir}/ocaml/fileutils/*.ml
+%{_libdir}/ocaml/fileutils/*.mli
 
 
 %changelog
+* Thu Oct  8 2009 Richard W.M. Jones <rjones@redhat.com> - 0.4.0-1
+- New upstream version 0.4.0.
+- Upstream build system has been rationalized, so remove all the
+  hacks we were using.
+- Upstream now contains tests, run them.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 6f698ce..1175571 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a3c24bb6e928dc9deb8d8f7e30206057  ocaml-fileutils-0.3.0.tar.gz
+93437c0fe6fa0e02c30e87af6a0d4e14  ocaml-fileutils-0.4.0.tar.gz