diff --git a/ocaml-fieldslib.spec b/ocaml-fieldslib.spec
index 0b6a9cf..e0717e5 100644
--- a/ocaml-fieldslib.spec
+++ b/ocaml-fieldslib.spec
@@ -1,4 +1,5 @@
 %undefine _package_note_flags
+
 %ifarch %{ocaml_native_compiler}
 # The only source file for this package consists of a single "include" line.
 # It exports some private functions from the library in ocaml-base.  Although
@@ -28,7 +29,6 @@ Source0:        %{url}/archive/v%{version}/%{srcname}-%{version}.tar.gz
 BuildRequires:  ocaml >= 4.08.0
 BuildRequires:  ocaml-base-devel >= 0.15
 BuildRequires:  ocaml-dune >= 2.0.0
-BuildRequires:  ocaml-odoc
 
 %description
 This package contains an OCaml syntax extension to define first class
@@ -48,46 +48,24 @@ developing applications that use %{name}.
 %autosetup -n %{srcname}-%{version}
 
 %build
-dune build %{?_smp_mflags} --verbose --release
-dune build %{?_smp_mflags} @doc
+%dune_build
 
 %install
-dune install --destdir=%{buildroot}
-
-%if %{with doc}
-# We do not want the dune markers
-find _build/default/_doc/_html -name .dune-keep -delete
-%endif
+%dune_install
 
-# We do not want the ml files
-find %{buildroot}%{_libdir}/ocaml -name \*.ml -delete
+%check
+%dune_check
 
-# We install the documentation with the doc macro
-rm -fr %{buildroot}%{_prefix}/doc
-
-%files
+%files -f .ofiles
 %doc CHANGES.md
 %license LICENSE.md
-%dir %{_libdir}/ocaml/%{srcname}/
-%{_libdir}/ocaml/%{srcname}/META
-%{_libdir}/ocaml/%{srcname}/*.cma
-%{_libdir}/ocaml/%{srcname}/*.cmi
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/%{srcname}/*.cmxs
-%endif
 
-%files devel
-%doc _build/default/_doc/_html/*
-%{_libdir}/ocaml/%{srcname}/dune-package
-%{_libdir}/ocaml/%{srcname}/opam
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/%{srcname}/*.a
-%{_libdir}/ocaml/%{srcname}/*.cmx
-%{_libdir}/ocaml/%{srcname}/*.cmxa
-%endif
-%{_libdir}/ocaml/%{srcname}/*.cmt
+%files devel -f .ofiles-devel
 
 %changelog
+* Wed Jul 20 2022 Jerry James <loganjerry@gmail.com> - 0.15.0-5
+- Use new OCaml macros
+
 * Sun Jun 19 2022 Richard W.M. Jones <rjones@redhat.com> - 0.15.0-5
 - OCaml 4.14.0 rebuild