diff --git a/ocaml-camlimages.spec b/ocaml-camlimages.spec
index 7b58a8d..0ba2e30 100644
--- a/ocaml-camlimages.spec
+++ b/ocaml-camlimages.spec
@@ -1,6 +1,9 @@
+%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
+%define debug_package %{nil}
+
 Name:           ocaml-camlimages
 Version:        2.2.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        OCaml image processing library
 
 Group:          Development/Libraries
@@ -14,12 +17,18 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # Excluding on ppc64 due to missing dependencies (Bug #239518)
 ExcludeArch:    ppc64
 
-BuildRequires:  lablgtk libpng-devel libjpeg-devel ocaml
+BuildRequires:  ocaml >= 3.10.1
+BuildRequires:  ocaml-lablgtk-devel
+BuildRequires:  lablgtk libpng-devel libjpeg-devel
 BuildRequires:  libXpm-devel ghostscript-devel freetype-devel
 BuildRequires:  giflib-devel
-Requires:       ocaml
 %define buildlibs ppm bmp xvthumb jpeg gif png xpm ps graphics freetype
 
+%define _use_internal_dependency_generator 0
+%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
+%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
+
+
 %description
 CamlImages is an image processing library for Objective CAML, which provides:
 basic functions for image processing and loading/saving, various image file 
@@ -35,6 +44,7 @@ files and escapes them to reduce the memory usage).
 Summary:        Development files for camlimages
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release} 
+
 %description    devel
 The camlimages-devel package provides libraries and headers for 
 developing applications using camlimages
@@ -55,7 +65,6 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm $RPM_BUILD_ROOT%{_libdir}/ocaml/camlimages/*.o
 rm $RPM_BUILD_ROOT%{_libdir}/ocaml/camlimages/*.cmo
-rm $RPM_BUILD_ROOT%{_libdir}/ocaml/camlimages/*.mli
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -64,15 +73,29 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc Announce Announce-2.2 CHANGES LICENSE README doc/
+%{_libdir}/ocaml/camlimages
 %{_libdir}/ocaml/stublibs/*.so
+%if %opt
+%exclude %{_libdir}/ocaml/camlimages/*.a
+%exclude %{_libdir}/ocaml/camlimages/*.cmxa
+%endif
+%exclude %{_libdir}/ocaml/camlimages/*.mli
 
 %files devel
 %defattr(-,root,root,-)
 %doc htmlref/
-%{_libdir}/ocaml/camlimages
+%if %opt
+%{_libdir}/ocaml/camlimages/*.a
+%{_libdir}/ocaml/camlimages/*.cmxa
+%endif
+%{_libdir}/ocaml/camlimages/*.mli
 
 
 %changelog
+* Wed Feb 13 2008 Richard W.M. Jones <rjones@redhat.com> 2.2.0-9
+- Rebuild for OCaml 3.10.1
+- Fix paths to conform to packaging policy.
+
 * Wed May 09 2007 Nigel Jones <dev@nigelj.com> 2.2.0-8
 - Exclude ppc64 builds due to missing ocaml