diff --git a/.gitignore b/.gitignore
index 219fe62..428d502 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 react-0.9.0.tbz
 /react-0.9.2.tbz
+/react-0.9.4.tbz
diff --git a/ocaml-react.spec b/ocaml-react.spec
index c02fc7f..bcd85c6 100644
--- a/ocaml-react.spec
+++ b/ocaml-react.spec
@@ -2,13 +2,10 @@
 %global debug_package %{nil}
 
 Name:           ocaml-react
-Version:        0.9.2
-Release:        5%{?dist}
+Version:        0.9.4
+Release:        1%{?dist}
 Summary:        OCaml framework for Functional Reactive Programming (FRP)
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Group:          Development/Libraries
 License:        BSD
 URL:            http://erratique.ch/software/react
 
@@ -20,10 +17,6 @@ BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  chrpath
 
-%global _use_internal_dependency_generator 0
-%global __find_requires /usr/lib/rpm/ocaml-find-requires.sh
-%global __find_provides /usr/lib/rpm/ocaml-find-provides.sh
-
 
 %description
 React is an OCaml module for functional reactive programming (FRP). It
@@ -40,7 +33,6 @@ and provides time stamp events, delayed events and delayed signals.
 
 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
 
@@ -52,57 +44,56 @@ developing applications that use %{name}.
 %prep
 %setup -q -n react-%{version}
 cp %{SOURCE1} LICENSE
-chmod +x build
+ocaml setup.ml -configure --prefix %{_prefix} --destdir $RPM_BUILD_ROOT
 
 
 %build
-./build
+ocaml setup.ml -build 
+
+%if %opt
+# Build the tests.
+ocamlbuild test/tests.otarget
+%endif
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-export INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/react
-mkdir -p $INSTALLDIR
-./build install
+export DESTDIR=$RPM_BUILD_ROOT
+export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
+mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
+ocaml setup.ml -install
 
 
 %check
 %if %opt
-./build test.native
 ./_build/test/test.native
-./build clock.native
 #./_build/test/clock.native
-./build breakout.native
 #./_build/test/breakout.native
 %endif
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc LICENSE
 %{_libdir}/ocaml/react
 %if %opt
 %exclude %{_libdir}/ocaml/react/*.cmx
 %endif
 %exclude %{_libdir}/ocaml/react/*.mli
-%exclude %{_libdir}/ocaml/react/*.ml
 
 
 %files devel
-%defattr(-,root,root,-)
 %doc CHANGES README
 %if %opt
 %{_libdir}/ocaml/react/*.cmx
 %endif
 %{_libdir}/ocaml/react/*.mli
-%{_libdir}/ocaml/react/*.ml
 
 
 %changelog
+* Tue Oct 30 2012 Richard W.M. Jones <rjones@redhat.com> - 0.9.4-1
+- New upstream version 0.9.4.
+- Rebuild for OCaml 4.00.1.
+- Clean up the spec file.
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index f72b98f..c2eaea3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ecbe0fa4d7d0fd1076cce5decf7a86b7  react-0.9.2.tbz
+ea5edd6475ad305e084744571e0c9209  react-0.9.4.tbz