diff --git a/ocaml-stdio.spec b/ocaml-stdio.spec
index 7c5e34d..4466189 100644
--- a/ocaml-stdio.spec
+++ b/ocaml-stdio.spec
@@ -1,29 +1,21 @@
 %undefine _package_note_flags
+
 %ifnarch %{ocaml_native_compiler}
 %global debug_package %{nil}
 %endif
 
-# Documentation adds a circular dependency, so by
-# default we build without.
-%bcond_with doc
-
-%global srcname stdio
-
-Name:           ocaml-%{srcname}
+Name:           ocaml-stdio
 Version:        0.15.0
 Release:        5%{?dist}
 Summary:        Jane Street Standard I/O library for OCaml
 
 License:        MIT
-URL:            https://github.com/janestreet/%{srcname}
-Source0:        %{url}/archive/v%{version}/%{srcname}-%{version}.tar.gz
+URL:            https://github.com/janestreet/stdio
+Source0:        %{url}/archive/v%{version}/stdio-%{version}.tar.gz
 
 BuildRequires:  ocaml >= 4.08.0
 BuildRequires:  ocaml-base-devel >= 0.15
 BuildRequires:  ocaml-dune >= 2.0.0
-%if %{with doc}
-BuildRequires:  ocaml-odoc
-%endif
 
 %description
 Stdio provides input/output functions for OCaml.  It re-exports the
@@ -39,70 +31,25 @@ Requires:       ocaml-base-devel%{?_isa}
 The %{name}-devel package contains libraries and signature files for
 developing applications that use %{name}.
 
-%if %{with doc}
-%package        doc
-Summary:        Documentation for %{name}
-BuildArch:      noarch
-
-%description    doc
-Documentation for %{name}.
-%endif
-
 %prep
-%autosetup -n %{srcname}-%{version}
+%autosetup -n stdio-%{version}
 
 %build
-dune build %{?_smp_mflags} --verbose --release
-%if %{with doc}
-dune build %{?_smp_mflags} @doc
-%endif
+%dune_build
 
 %install
-dune install --destdir=%{buildroot}
+%dune_install
 
-%if %{with doc}
-# We do not want the dune markers
-find _build/default/_doc/_html -name .dune-keep -delete
-%endif
-
-# We do not want the ml files
-find %{buildroot}%{_libdir}/ocaml -name \*.ml -delete
-
-# We install the documentation with the doc macro
-rm -fr %{buildroot}%{_prefix}/doc
-
-%files
+%files -f .ofiles
 %doc CHANGES.md README.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
-%{_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
-%{_libdir}/ocaml/%{srcname}/*.cmti
-%{_libdir}/ocaml/%{srcname}/*.mli
-
-%if %{with doc}
-%files doc
-%doc _build/default/_doc/_html/
-%doc _build/default/_doc/_mlds/
-%doc _build/default/_doc/_odoc/
-%license LICENSE.md
-%endif
+%files devel -f .ofiles-devel
 
 %changelog
+* Tue Jun 28 2022 Jerry James <loganjerry@gmail.com> - 0.15.0-5
+- Use new OCaml macros
+
 * Sat Jun 18 2022 Richard W.M. Jones <rjones@redhat.com> - 0.15.0-5
 - OCaml 4.14.0 rebuild