diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec
index 55f22b2..156206e 100644
--- a/ocaml-fileutils.spec
+++ b/ocaml-fileutils.spec
@@ -27,7 +27,7 @@ Url:            https://forge.ocamlcore.org/projects/ocaml-fileutils/
 Source0:        ocaml-fileutils-%{version}.tar.xz
 BuildRequires:  ocaml >= 4.00.1
 BuildRequires:  ocaml-rpm-macros >= 4.02.1
-BuildRequires:  ocaml-findlib-devel >= 1.3.3-3
+BuildRequires:  ocaml-findlib
 BuildRequires:  ocaml-ocamlbuild
 BuildRequires:  ocaml-ocamldoc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -84,24 +84,26 @@ make %{?_smp_mflags} test
 %files
 %defattr(-,root,root,-)
 %doc COPYING.txt
-%{_libdir}/ocaml/fileutils
+%dir %{_libdir}/ocaml
+%dir %{_libdir}/ocaml/*
 %if %{ocaml_native_compiler}
-%exclude %{_libdir}/ocaml/fileutils/*.a
-%exclude %{_libdir}/ocaml/fileutils/*.cmx
-%exclude %{_libdir}/ocaml/fileutils/*.cmxa
+%{_libdir}/ocaml/*/*.cmxs
 %endif
-%exclude %{_libdir}/ocaml/fileutils/*.ml
-%exclude %{_libdir}/ocaml/fileutils/*.mli
 
 %files devel
 %defattr(-,root,root,-)
 %doc COPYING.txt AUTHORS.txt CHANGELOG.txt README.txt TODO.txt
+%dir %{_libdir}/ocaml
+%dir %{_libdir}/ocaml/*
+%{_libdir}/ocaml/*/*.a
 %if %{ocaml_native_compiler}
-%{_libdir}/ocaml/fileutils/*.a
-%{_libdir}/ocaml/fileutils/*.cmx
-%{_libdir}/ocaml/fileutils/*.cmxa
+%{_libdir}/ocaml/*/*.cmx
+%{_libdir}/ocaml/*/*.cmxa
 %endif
-%{_libdir}/ocaml/fileutils/*.ml
-%{_libdir}/ocaml/fileutils/*.mli
+%{_libdir}/ocaml/*/*.cma
+%{_libdir}/ocaml/*/*.cmi
+%{_libdir}/ocaml/*/*.mli
+%{_libdir}/ocaml/*/*.ml
+%{_libdir}/ocaml/*/META
 
 %changelog