diff --git a/ocaml-ounit.changes b/ocaml-ounit.changes
index 60abdb3..b6645e0 100644
--- a/ocaml-ounit.changes
+++ b/ocaml-ounit.changes
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Mon May 30 06:39:17 UTC 2016 - ohering@suse.de
 
-- Use ocamlfind() macro (fate#320836)
+- Use oasis (fate#320836)
 
 -------------------------------------------------------------------
 Tue Nov 10 10:18:47 UTC 2015 - ohering@suse.de
diff --git a/ocaml-ounit.spec b/ocaml-ounit.spec
index 6f2260d..d084a3f 100644
--- a/ocaml-ounit.spec
+++ b/ocaml-ounit.spec
@@ -27,8 +27,7 @@ Url:            http://ounit.forge.ocamlcore.org/
 Source0:        ounit-%{version}.tar.gz
 Patch0:         ounit-strict-formats.diff
 BuildRequires:  ocaml
-BuildRequires:  ocamlfind(findlib)
-BuildRequires:  ocaml-ocamlbuild
+BuildRequires:  ocaml-oasis
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-rpm-macros >= 4.02.1
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -64,6 +63,7 @@ Development files needed for application based on %{name}.
 %patch0 -p1
 
 %build
+oasis setup
 ocaml setup.ml -configure \
       --bindir '%{_bindir}' \
       --mandir '%{_mandir}' \
@@ -78,12 +78,12 @@ ocaml setup.ml -configure \
       --exec-prefix '%{_exec_prefix}' \
       --sharedstatedir '%{_sharedstatedir}'
 
-make %{?_smp_mflags}
+ocaml setup.ml -build
 
 %install
-export OCAMLFIND_DESTDIR=%{buildroot}%{_libdir}/ocaml
-test -d "$OCAMLFIND_DESTDIR" || mkdir -p "$OCAMLFIND_DESTDIR"
-make install %{?_smp_mflags}
+export OCAMLFIND_DESTDIR=%{buildroot}`ocamlc -where`
+mkdir -p $OCAMLFIND_DESTDIR
+ocaml setup.ml -install
 
 %files
 %defattr(-,root,root,-)
@@ -103,8 +103,11 @@ make install %{?_smp_mflags}
 %{_libdir}/ocaml/*/*.cmx
 %{_libdir}/ocaml/*/*.cmxa
 %endif
+%{_libdir}/ocaml/*/*.annot
 %{_libdir}/ocaml/*/*.cma
 %{_libdir}/ocaml/*/*.cmi
+%{_libdir}/ocaml/*/*.cmt
+%{_libdir}/ocaml/*/*.cmti
 %{_libdir}/ocaml/*/*.ml
 %{_libdir}/ocaml/*/*.mli
 %{_libdir}/ocaml/*/META