diff --git a/ocaml.spec b/ocaml.spec
index 8750aea..9b4a3fe 100644
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -2,7 +2,7 @@
 
 Name:          ocaml
 Version:       4.11.1
-Release:       3mamba
+Release:       4mamba
 Summary:       The OCaml compiler and programming environment
 Group:         Applications/Development
 Vendor:        openmamba
@@ -74,6 +74,22 @@ Provides:      ocaml(runtime) = %{?epoch:%epoch:}%{version}-%{release}
 This package contains the runtime environment needed to run OCaml bytecode.
 In particular the OCaml bytecode interpreter: ocamlrun.
 
+%package source
+Summary:        Source code for OCaml libraries
+Requires:       ocaml = %{?epoch:%epoch:}%{version}-%{release}
+	
+%description source
+Source code for OCaml libraries.
+
+%package compiler-libs
+Summary:        Compiler libraries for OCaml	
+Requires:       ocaml = %{?epoch:%epoch:}%{version}-%{release}
+
+%description compiler-libs
+OCaml is a high-level, strongly-typed, functional and object-oriented programming language from the ML family of languages.
+This package contains some modules used internally by the OCaml compilers, useful for the development of some OCaml applications.
+Note that this exposes internal details of the OCaml compiler which	may not be portable between versions.
+
 %package camlp4
 Summary:       Pre-Processor-Pretty-Printer for OCaml
 Requires:      %{name}-runtime = %{?epoch:%epoch:}%{version}-%{release}
@@ -157,14 +173,16 @@ This package contains documentation in PDF and HTML format as well as man pages
 
 %debug_package
 
+%global __ocaml_requires_opts -c -f '%{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo.byte'	
+%global __ocaml_provides_opts -f '%{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo.byte'
+
 %prep
-%setup -q -a2 -a3
-#-D -T
-#:<< _EOF
+%setup -q -a2 -a3 -D -T
+:<< _EOF
 cp %{S:1} refman.pdf
 
 %build
-#:<< _EOF
+:<< _EOF
 %configure \
    --libdir=%{_libdir}/ocaml \
    --with-pic
@@ -235,8 +253,6 @@ exit 0
 %{_bindir}/ocamlopt.byte
 %{_bindir}/ocamlprof.byte
 %{_bindir}/ocamlprof.opt
-%{_bindir}/ocamlrund
-%{_bindir}/ocamlruni
 %{_bindir}/ocamlcp
 %{_bindir}/ocamldebug
 %{_bindir}/ocamldep
@@ -268,27 +284,18 @@ exit 0
 %{_libdir}/ocaml/*.cmxa
 %{_libdir}/ocaml/*.cmx
 %{_libdir}/ocaml/*.o
-%{_libdir}/ocaml/*.ml
 %{_libdir}/ocaml/*.mli
 %{_libdir}/ocaml/libcamlrun_shared.so
 %{_libdir}/ocaml/libasmrun_shared.so
 %{_libdir}/ocaml/objinfo_helper
-%{_libdir}/ocaml/compiler-libs/*.a
-%{_libdir}/ocaml/compiler-libs/*.cmx
-%{_libdir}/ocaml/compiler-libs/*.cmxa
-%{_libdir}/ocaml/compiler-libs/*.o
-%{_libdir}/ocaml/compiler-libs/*.mli
-%ifarch x86_64 aarch64
-%{_libdir}/ocaml/stublibs/dllraw_spacetime_lib.so
-%endif
 #%{_libdir}/ocaml/vmthreads/*.a
 #%{_libdir}/ocaml/vmthreads/*.mli
 %{_libdir}/ocaml/threads/*.a
 %{_libdir}/ocaml/threads/*.cmx
 %{_libdir}/ocaml/threads/*.cmxa
+%{_libdir}/ocaml/threads/*.cmti
+%{_libdir}/ocaml/threads/*.mli
 %{_libdir}/ocaml/caml
-%{_libdir}/ocaml/camlheaderd
-%{_libdir}/ocaml/camlheaderi
 %{_mandir}/man1/ocaml.*
 %{_mandir}/man1/ocamlc.*
 %{_mandir}/man1/ocamlcp.*
@@ -304,29 +311,47 @@ exit 0
 %files runtime
 %defattr(-,root,root)
 %{_bindir}/ocamlrun
+%{_bindir}/ocamlrund
+%{_bindir}/ocamlruni
+%dir %{_libdir}/ocaml
 %{_libdir}/ocaml/VERSION
 %{_libdir}/ocaml/*.cmo
 %{_libdir}/ocaml/*.cmi
 %{_libdir}/ocaml/*.cma
+%{_libdir}/ocaml/camlheaderd
+%{_libdir}/ocaml/camlheaderi
+%dir %{_libdir}/ocaml/stublibs
+%{_libdir}/ocaml/stublibs/dllcamlstr.so
+%{_libdir}/ocaml/stublibs/dllthreads.so
+%{_libdir}/ocaml/stublibs/dllunix.so
+%ifarch x86_64 aarch64
+%{_libdir}/ocaml/stublibs/dllraw_spacetime_lib.so
+%endif
+%dir %{_libdir}/ocaml/threads
+%{_libdir}/ocaml/threads/*.cmi
+%{_libdir}/ocaml/threads/*.cma
+%{_mandir}/man1/ocamlrun.*
+%doc LICENSE
+
+%files source
+%defattr(-,root,root)
+%{_libdir}/ocaml/*.ml
 %{_libdir}/ocaml/*.cmt
 %{_libdir}/ocaml/*.cmti
+
+%files compiler-libs
+%defattr(-,root,root)
 %dir %{_libdir}/ocaml/compiler-libs
+%{_libdir}/ocaml/compiler-libs/*.mli
 %{_libdir}/ocaml/compiler-libs/*.cmo
 %{_libdir}/ocaml/compiler-libs/*.cmi
 %{_libdir}/ocaml/compiler-libs/*.cma
 %{_libdir}/ocaml/compiler-libs/*.cmt
 %{_libdir}/ocaml/compiler-libs/*.cmti
-%dir %{_libdir}/ocaml/stublibs
-%{_libdir}/ocaml/stublibs/dllcamlstr.so
-%{_libdir}/ocaml/stublibs/dllthreads.so
-%{_libdir}/ocaml/stublibs/dllunix.so
-%dir %{_libdir}/ocaml/threads
-%{_libdir}/ocaml/threads/*.cmi
-%{_libdir}/ocaml/threads/*.cmti
-%{_libdir}/ocaml/threads/*.cma
-%{_libdir}/ocaml/threads/*.mli
-%{_mandir}/man1/ocamlrun.*
-%doc LICENSE
+%{_libdir}/ocaml/compiler-libs/*.a
+%{_libdir}/ocaml/compiler-libs/*.cmx
+%{_libdir}/ocaml/compiler-libs/*.cmxa
+%{_libdir}/ocaml/compiler-libs/*.o
 
 #%files x11
 #%defattr(-,root,root)
@@ -353,6 +378,9 @@ exit 0
 #%doc refman.pdf htmlman
 
 %changelog
+* Sat Apr 24 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 4.11.1-4mamba
+- added subpackages ocaml-source and ocaml-compiler-libs
+
 * Thu Apr 22 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 4.11.1-3mamba
 - rebuilt with recent rpm ocamldeps