diff --git a/ocaml-lablgtk.spec b/ocaml-lablgtk.spec
index 7027d74..ee7b2df 100644
--- a/ocaml-lablgtk.spec
+++ b/ocaml-lablgtk.spec
@@ -6,7 +6,6 @@ Release:        1%{?dist}
 
 Summary:        Objective Caml interface to gtk+
 
-Group:          System Environment/Libraries
 License:        LGPLv2 with exceptions
 
 URL:            http://lablgtk.forge.ocamlcore.org/
@@ -15,7 +14,6 @@ Source:         http://forge.ocamlcore.org/frs/download.php/979/lablgtk-%{versio
 # Patch sent upstream 2011-07-27 by RWMJ.
 Patch0:         lablgtk-2.16.0-avoid-queue-empty-in-gtkThread.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
 
 Obsoletes:      lablgtk <= 2.6.0-7
@@ -86,12 +84,14 @@ make doc CAMLP4O="camlp4o -I %{_libdir}/ocaml/camlp4/Camlp4Parsers"
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+export DESTDIR=$RPM_BUILD_ROOT
+export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_libdir}
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
 make install \
+     RANLIB=true \
      BINDIR=$RPM_BUILD_ROOT%{_bindir} \
      LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
      INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 \
@@ -112,25 +112,19 @@ popd
 find examples -name .cvsignore -exec rm {} \;
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc README COPYING CHANGES
 %dir %{_libdir}/ocaml/lablgtk2
 %{_libdir}/ocaml/lablgtk2/*.cmi
 %{_libdir}/ocaml/lablgtk2/*.cma
 %{_libdir}/ocaml/lablgtk2/*.cmxs
-%{_libdir}/ocaml/stublibs/*.so
+%{_libdir}/ocaml/stublibs/*.so*
 %{_bindir}/gdk_pixbuf_mlsource
 %{_bindir}/lablgladecc2
 %{_bindir}/lablgtk2
 
 
 %files devel
-%defattr(-,root,root,-)
 %doc README COPYING CHANGES
 %dir %{_libdir}/ocaml/lablgtk2
 %{_libdir}/ocaml/lablgtk2/META
@@ -150,11 +144,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files doc
-%defattr(-,root,root,-)
 %doc examples doc/html
 
 
 %changelog
+* Wed Oct 17 2012 Richard W.M. Jones <rjones@redhat.com> - 2.16.0-2
+- Clean up the spec file.
+- Set OCAMLFIND_DESTDIR so the ocamlfind install works.
+
 * Wed Oct 17 2012 Orion Poplawski <orion@cora.nwra.com> - 2.16.0-1
 - Update to 2.16.0
 - Rebase avoid-queue-empty-in-gtkThread patch