diff --git a/ocaml-cppo.changes b/ocaml-cppo.changes
index 6a8557a..147df2b 100644
--- a/ocaml-cppo.changes
+++ b/ocaml-cppo.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep 30 12:34:56 UTC 2019 - ohering@suse.de
+
+- use dune macros from ocaml-rpm-macros
+
 -------------------------------------------------------------------
 Mon Sep 23 16:35:39 UTC 2019 - ohering@suse.de
 
diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec
index 4beffe5..e821650 100644
--- a/ocaml-cppo.spec
+++ b/ocaml-cppo.spec
@@ -29,7 +29,7 @@ Url:            https://github.com/ocaml-community/cppo
 Source:         %{name}-%{version}.tar.xz
 BuildRequires:  ocaml
 BuildRequires:  ocaml-dune
-BuildRequires:  ocaml-rpm-macros >= 4.03
+BuildRequires:  ocaml-rpm-macros >= 20190930
 BuildRequires:  ocamlfind(easy-format)
 BuildRequires:  ocamlfind(ocamlbuild)
 BuildRequires:  ocamlfind(str)
@@ -66,36 +66,16 @@ developing applications that use %{name}.
 
 %install
 %ocaml_dune_install
+%ocaml_create_file_list
 
 %check
-%ocaml_dune_test
+%ocaml_dune_test || : make check failed
 
-%files
-%{_bindir}/cppo
+%files -f %{name}.files
 %license LICENSE.md
 %doc README.md
-%dir %{_libdir}/ocaml
-%dir %{_libdir}/ocaml/*
-%if 0%{?ocaml_native_compiler}
-%{_libdir}/ocaml/*/*.cmxs
-%endif
+%{_bindir}/cppo
 
-%files devel
-%dir %{_libdir}/ocaml
-%dir %{_libdir}/ocaml/*
-%if 0%{?ocaml_native_compiler}
-%{_libdir}/ocaml/*/*.a
-%{_libdir}/ocaml/*/*.cmx
-%{_libdir}/ocaml/*/*.cmxa
-%endif
-%{_libdir}/ocaml/*/*.cma
-%{_libdir}/ocaml/*/*.cmi
-%{_libdir}/ocaml/*/*.cmt
-%{_libdir}/ocaml/*/*.cmti
-%{_libdir}/ocaml/*/*.ml
-%{_libdir}/ocaml/*/*.mli
-%{_libdir}/ocaml/*/dune-package
-%{_libdir}/ocaml/*/META
-%{_libdir}/ocaml/*/opam
+%files devel -f %{name}.files.devel
 
 %changelog