diff --git a/utop.spec b/utop.spec
index 70b5b0a..200a28c 100644
--- a/utop.spec
+++ b/utop.spec
@@ -1,4 +1,5 @@
 %undefine _package_note_flags
+
 # The OCaml code is byte compiled, not native compiled, so there are no ELF
 # objects in the binary RPM.
 %global debug_package %{nil}
@@ -36,11 +37,8 @@ colors, and more.
 %package devel
 Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       ocaml-camomile-devel%{?_isa}
+Requires:       ocaml-findlib%{?_isa}
 Requires:       ocaml-lambda-term-devel%{?_isa}
-Requires:       ocaml-lwt-react-devel%{?_isa}
-Requires:       ocaml-react-devel%{?_isa}
-Provides:       ocaml-%{name}-devel%{?_isa} = %{version}-%{release}
 
 %description devel
 The %{name}-devel package contains libraries and signature files for
@@ -61,9 +59,8 @@ for OCaml.
 %autosetup
 
 %build
-dune build --verbose \
-    --for-release-of-packages=%{name} \
-    %{?_smp_mflags}
+%dune_build
+
 cd src/top
 emacs -batch --no-init-file --no-site-file \
     --eval "(progn (setq generated-autoload-file \"$PWD/utop-autoloads.el\" backup-inhibited t) (update-directory-autoloads \".\"))"
@@ -71,42 +68,27 @@ emacs -batch --no-init-file --no-site-file \
 cd -
 
 %install
-dune install --verbose \
-    --for-release-of-packages=%{name} \
-    --destdir=%{buildroot} \
-    --libdir=%{_libdir}/ocaml
-
-rm -f %{buildroot}/usr/doc/%{name}/{LICENSE,CHANGES.md,README.md}
+%dune_install
 
+# Install the Emacs interface
 mkdir -p %{buildroot}%{_emacs_sitestartdir}
 cp -p src/top/utop-autoloads.* %{buildroot}%{_emacs_sitestartdir}
 cp -p src/top/utop.elc %{buildroot}%{_emacs_sitelispdir}
 
-%files
+%files -f .ofiles
 %license LICENSE
 %doc README.md CHANGES.md
-%{_bindir}/%{name}*
-%dir %{_libdir}/ocaml/%{name}
-%{_libdir}/ocaml/%{name}/META
-%{_libdir}/ocaml/%{name}/*.cma
-%{_libdir}/ocaml/%{name}/*.cmi
-%{_mandir}/man1/%{name}*
-%{_mandir}/man5/%{name}*
-%{_datadir}/%{name}/
-
-%files devel
-%{_libdir}/ocaml/%{name}/dune-package
-%{_libdir}/ocaml/%{name}/opam
-%{_libdir}/ocaml/%{name}/*.cmt
-%{_libdir}/ocaml/%{name}/*.cmti
-%{_libdir}/ocaml/%{name}/*.ml
-%{_libdir}/ocaml/%{name}/*.mli
+
+%files devel -f .ofiles-devel
 
 %files -n emacs-utop
 %{_emacs_sitelispdir}/%{name}.el*
 %{_emacs_sitestartdir}/%{name}-autoloads.el*
 
 %changelog
+* Wed Jul 20 2022 Jerry James <loganjerry@gmail.com> - 2.9.2-2
+- Use new OCaml macros
+
 * Sun Jun 19 2022 Richard W.M. Jones <rjones@redhat.com> - 2.9.2-2
 - OCaml 4.14.0 rebuild