diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec
index 50ca8c4..1389ed0 100644
--- a/ocaml-findlib.spec
+++ b/ocaml-findlib.spec
@@ -36,19 +36,12 @@ Requires:       ocaml-compiler-libs
 Requires:       ocaml-runtime
 %endif
 # ocaml autodep end for pkg: ocaml-findlib
-Recommends:     ocaml-findlib-bigarray
-Recommends:     ocaml-findlib-bytes
+#
 Recommends:     ocaml-findlib-camlp4
-Recommends:     ocaml-findlib-compiler-libs
-Recommends:     ocaml-findlib-dynlink
-Recommends:     ocaml-findlib-graphics
-Recommends:     ocaml-findlib-num
-Recommends:     ocaml-findlib-ocamldoc
-Recommends:     ocaml-findlib-stdlib
-Recommends:     ocaml-findlib-str
-Requires:       ocaml-findlib-threads
-Recommends:     ocaml-findlib-unix
-
+#
+Requires:       ocaml-compiler-libs
+Requires:       ocaml-runtime
+#
 Provides:       ocamlfind = %{version}
 
 BuildRequires:  gawk
@@ -77,28 +70,7 @@ Requires:       %{name} = %{version}-%{release}
 The ocaml-findlib-devel package contains libraries and signature files
 for developing applications that use ocaml-findlib.
 
-%package bigarray
-Summary:        Development files for ocaml-findlib
-Group:          Development/Libraries/Other
-Requires:       ocaml-runtime
 
-%description bigarray
-The ocaml-findlib-bigarray contains signature files for developing applications that use bigarray
-%files bigarray
-%defattr(-,root,root,-)
-%dir %{_libdir}/ocaml/bigarray
-%{_libdir}/ocaml/bigarray/META
-
-%package bytes
-Summary:        Development files for ocaml-findlib
-Group:          Development/Libraries/Other
-
-%description bytes
-The ocaml-findlib-bytes contains signature files for developing applications that use bytes
-%files bytes
-%defattr(-,root,root,-)
-%dir %{_libdir}/ocaml/bytes
-%{_libdir}/ocaml/bytes/META
 
 %package camlp4
 Summary:        Development files for ocaml-findlib
@@ -107,116 +79,6 @@ Requires:       ocaml-camlp4-devel
 
 %description camlp4
 The ocaml-findlib-camlp4 contains signature files for developing applications that use camlp4
-%files camlp4
-%defattr(-,root,root,-)
-%dir %{_libdir}/ocaml/camlp4
-%{_libdir}/ocaml/camlp4/META
-
-%package compiler-libs
-Summary:        Development files for ocaml-findlib
-Group:          Development/Libraries/Other
-Requires:       ocaml-compiler-libs
-
-%description compiler-libs
-The ocaml-findlib-compiler-libs contains signature files for developing applications that use compiler-libs
-%files compiler-libs
-%defattr(-,root,root,-)
-%dir %{_libdir}/ocaml/compiler-libs
-%{_libdir}/ocaml/compiler-libs/META
-
-%package dynlink
-Summary:        Development files for ocaml-findlib
-Group:          Development/Libraries/Other
-Requires:       ocaml-runtime
-
-%description dynlink
-The ocaml-findlib-dynlink contains signature files for developing applications that use dynlink
-%files dynlink
-%defattr(-,root,root,-)
-%dir %{_libdir}/ocaml/dynlink
-%{_libdir}/ocaml/dynlink/META
-
-%package graphics
-Summary:        Development files for ocaml-findlib
-Group:          Development/Libraries/Other
-Requires:       ocaml-runtime
-
-%description graphics
-The ocaml-findlib-graphics contains signature files for developing applications that use graphics
-%files graphics
-%defattr(-,root,root,-)
-%dir %{_libdir}/ocaml/graphics
-%{_libdir}/ocaml/graphics/META
-
-%package num
-Summary:        Development files for ocaml-findlib
-Group:          Development/Libraries/Other
-Requires:       ocaml-runtime
-
-%description num
-The ocaml-findlib-num contains signature files for developing applications that use num
-%files num
-%defattr(-,root,root,-)
-%dir %{_libdir}/ocaml/num
-%{_libdir}/ocaml/num/META
-
-%package ocamldoc
-Summary:        Development files for ocaml-findlib
-Group:          Development/Libraries/Other
-
-%description ocamldoc
-The ocaml-findlib-ocamldoc contains signature files for developing applications that use ocamldoc
-%files ocamldoc
-%defattr(-,root,root,-)
-%dir %{_libdir}/ocaml/ocamldoc
-%{_libdir}/ocaml/ocamldoc/META
-
-%package stdlib
-Summary:        Development files for ocaml-findlib
-Group:          Development/Libraries/Other
-
-%description stdlib
-The ocaml-findlib-stdlib contains signature files for developing applications that use stdlib
-%files stdlib
-%defattr(-,root,root,-)
-%dir %{_libdir}/ocaml/stdlib
-%{_libdir}/ocaml/stdlib/META
-
-%package str
-Summary:        Development files for ocaml-findlib
-Group:          Development/Libraries/Other
-Requires:       ocaml-runtime
-
-%description str
-The ocaml-findlib-str contains signature files for developing applications that use str
-%files str
-%defattr(-,root,root,-)
-%dir %{_libdir}/ocaml/str
-%{_libdir}/ocaml/str/META
-
-%package threads
-Summary:        Development files for ocaml-findlib
-Group:          Development/Libraries/Other
-Requires:       ocaml-runtime
-
-%description threads
-The ocaml-findlib-threads contains signature files for developing applications that use threads
-%files threads
-%defattr(-,root,root,-)
-%dir %{_libdir}/ocaml/threads
-%{_libdir}/ocaml/threads/META
-
-%package unix
-Summary:        Development files for ocaml-findlib
-Group:          Development/Libraries/Other
-Requires:       ocaml-runtime
-
-%description unix
-The ocaml-findlib-unix contains signature files for developing applications that use unix
-%files unix
-%defattr(-,root,root,-)
-%dir %{_libdir}/ocaml/unix
-%{_libdir}/ocaml/unix/META
 
 %prep
 %setup -q -n findlib-%{version}
@@ -247,6 +109,30 @@ rm -rfv $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild
 %{_bindir}/*
 %{_mandir}/man?/*
 #
+%dir %{_libdir}/ocaml
+%dir %{_libdir}/ocaml/bigarray
+%{_libdir}/ocaml/bigarray/META
+%dir %{_libdir}/ocaml/bytes
+%{_libdir}/ocaml/bytes/META
+%dir %{_libdir}/ocaml/compiler-libs
+%{_libdir}/ocaml/compiler-libs/META
+%dir %{_libdir}/ocaml/dynlink
+%{_libdir}/ocaml/dynlink/META
+%dir %{_libdir}/ocaml/graphics
+%{_libdir}/ocaml/graphics/META
+%dir %{_libdir}/ocaml/num
+%{_libdir}/ocaml/num/META
+%dir %{_libdir}/ocaml/ocamldoc
+%{_libdir}/ocaml/ocamldoc/META
+%dir %{_libdir}/ocaml/stdlib
+%{_libdir}/ocaml/stdlib/META
+%dir %{_libdir}/ocaml/str
+%{_libdir}/ocaml/str/META
+%dir %{_libdir}/ocaml/threads
+%{_libdir}/ocaml/threads/META
+%dir %{_libdir}/ocaml/unix
+%{_libdir}/ocaml/unix/META
+#
 %{_libdir}/ocaml/topfind
 %dir %{_libdir}/ocaml/findlib
 %if %{ocaml_native_compiler}
@@ -258,6 +144,7 @@ rm -rfv $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild
 %doc LICENSE doc/README doc/guide-html
 %{_libdir}/ocaml/*/Makefile.config
 #
+%dir %{_libdir}/ocaml
 %dir %{_libdir}/ocaml/findlib
 %dir %{_libdir}/ocaml/num-top
 %{_libdir}/ocaml/findlib/META
@@ -270,4 +157,10 @@ rm -rfv $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild
 %{_libdir}/ocaml/*/*.cmi
 %{_libdir}/ocaml/*/*.mli
 
+%files camlp4
+%defattr(-,root,root,-)
+%dir %{_libdir}/ocaml
+%dir %{_libdir}/ocaml/camlp4
+%{_libdir}/ocaml/camlp4/META
+
 %changelog