diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec
index f559d31..f892f8b 100644
--- a/ocaml-calendar.spec
+++ b/ocaml-calendar.spec
@@ -73,25 +73,33 @@ iconv -f iso-8859-1 -t utf-8 < TODO.old > TODO
 %install
 export DESTDIR=%{buildroot}
 export OCAMLFIND_DESTDIR=%{buildroot}%{_libdir}/ocaml
-mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
+mkdir -p $OCAMLFIND_DESTDIR
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
 
 
 %files
 %defattr(-,root,root,-)
 %doc CHANGES README TODO LGPL COPYING
-%{_libdir}/ocaml/calendar
+%dir %{_libdir}/ocaml/*
 %if %{ocaml_native_compiler}
-%exclude %{_libdir}/ocaml/calendar/*.cmx
+%{_libdir}/ocaml/*/*.cmxs
 %endif
-%exclude %{_libdir}/ocaml/calendar/*.mli
 
 %files devel
 %defattr(-,root,root,-)
 %doc CHANGES README TODO LGPL COPYING doc/*
+%dir %{_libdir}/ocaml/*
 %if %{ocaml_native_compiler}
-%{_libdir}/ocaml/calendar/*.cmx
+%{_libdir}/ocaml/*/*.a
+%{_libdir}/ocaml/*/*.cmx
+%{_libdir}/ocaml/*/*.cmxa
 %endif
-%{_libdir}/ocaml/calendar/*.mli
+%{_libdir}/ocaml/*/*.cma
+%{_libdir}/ocaml/*/*.cmi
+%{_libdir}/ocaml/*/*.cmo
+%{_libdir}/ocaml/*/*.mli
+%{_libdir}/ocaml/*/*.o
+%{_libdir}/ocaml/*/META
 
 %changelog
+