diff --git a/ocaml-odoc.spec b/ocaml-odoc.spec
index 842b410..04a0f20 100644
--- a/ocaml-odoc.spec
+++ b/ocaml-odoc.spec
@@ -2,7 +2,7 @@
 ExcludeArch: %{ix86}
 
 Name:           ocaml-odoc
-Version:        2.2.1
+Version:        2.3.0
 Release:        1%{?dist}
 Summary:        Documentation compiler for OCaml and Reason
 
@@ -10,26 +10,28 @@ Summary:        Documentation compiler for OCaml and Reason
 # BSD-3-Clause: src/html_support_files/highlight.pack.js
 License:        ISC AND BSD-3-Clause
 URL:            https://github.com/ocaml/odoc
-Source0:        %{url}/archive/%{version}/odoc-%{version}.tar.gz
+Source0:        %{url}/releases/download/v%{version}/odoc-%{version}.tbz
 
 BuildRequires:  jq
 BuildRequires:  ocaml >= 4.02.0
 BuildRequires:  ocaml-astring-devel
 BuildRequires:  ocaml-bisect-ppx-devel > 2.5.0
 BuildRequires:  ocaml-bos-devel
+BuildRequires:  ocaml-camlp-streams-devel
 BuildRequires:  ocaml-cmdliner-devel >= 1.0.0
 BuildRequires:  ocaml-cppo >= 1.1.0
-BuildRequires:  ocaml-dune >= 2.9.1
+BuildRequires:  ocaml-dune >= 3.7.0
 BuildRequires:  ocaml-findlib
 BuildRequires:  ocaml-fmt-devel
 BuildRequires:  ocaml-fpath-devel
 BuildRequires:  ocaml-mdx-devel
-BuildRequires:  ocaml-odoc-parser-devel >= 0.9.0
 BuildRequires:  ocaml-ppx-expect-devel
 BuildRequires:  ocaml-result-devel
 BuildRequires:  ocaml-sexplib0-devel
 BuildRequires:  ocaml-tyxml-devel >= 4.3.0
-BuildRequires:  ocaml-yojson-devel
+BuildRequires:  ocaml-yojson-devel >= 1.6.0
+
+Requires:       ocaml-odoc-parser%{?_isa} = %{version}-%{release}
 
 %description
 This package contains odoc, a documentation generator for OCaml and
@@ -45,9 +47,10 @@ but this is very much a work in progress.
 License:        ISC
 Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}-parser-devel%{?_isa} = %{version}-%{release}
+Requires:       ocaml-astring-devel%{?_isa}
 Requires:       ocaml-fmt-devel%{?_isa}
 Requires:       ocaml-fpath-devel%{?_isa}
-Requires:       ocaml-odoc-parser-devel%{?_isa}
 Requires:       ocaml-result-devel%{?_isa}
 Requires:       ocaml-tyxml-devel%{?_isa}
 
@@ -55,6 +58,30 @@ Requires:       ocaml-tyxml-devel%{?_isa}
 The %{name}-devel package contains libraries and signature files for
 developing applications that use %{name}.
 
+%package        parser
+License:        ISC
+Summary:        Parser for OCaml documentation comments
+
+%description    parser
+Odoc-parser is a parser for odoc markup, which is an extension of the
+original markup language parsed by ocamldoc.
+
+OCaml code can contain specially formatted comments that are used to
+document the interfaces of modules.  These comments are delimited by
+`(**` and `*)`.  This parser is intended to be used to parse the
+contents of these comments.
+
+%package        parser-devel
+Summary:        Development files for %{name}-parser
+Requires:       %{name}-parser%{?_isa} = %{version}-%{release}
+Requires:       ocaml-astring-devel%{?_isa}
+Requires:       ocaml-camlp-streams-devel%{?_isa}
+Requires:       ocaml-result-devel%{?_isa}
+
+%description    parser-devel
+The %{name}-parser-devel package contains libraries and signature
+files for developing applications that use %{name}-parser.
+
 %package        doc
 License:        ISC
 Summary:        Documentation for %{name}
@@ -70,7 +97,7 @@ Documentation for %{name}.
 %dune_build @default @doc
 
 %install
-%dune_install
+%dune_install -s
 
 # Install the man page
 mkdir -p %{buildroot}%{_mandir}/man1
@@ -80,18 +107,27 @@ _build/install/default/bin/odoc --help groff > %{buildroot}%{_mandir}/man1/odoc.
 #check
 #dune_check
 
-%files -f .ofiles
+%files -f .ofiles-odoc
 %doc CHANGES.md README.md
-%license LICENSE.md src/html_support_files/LICENSE
+%license LICENSE
 %{_mandir}/man1/odoc.1*
 
-%files devel -f .ofiles-devel
+%files devel -f .ofiles-odoc-devel
+
+%files parser -f .ofiles-odoc-parser
+%license LICENSE
+
+%files parser-devel -f .ofiles-odoc-parser-devel
 
 %files doc
 %doc _build/default/_doc/_html/*
-%license LICENSE.md
+%license LICENSE
 
 %changelog
+* Wed Oct  4 2023 Jerry James <loganjerry@gmail.com> - 2.3.0-1
+- Version 2.3.0
+- odoc-parser has been merged back in
+
 * Tue Aug  8 2023 Jerry James <loganjerry@gmail.com> - 2.2.1-1
 - Version 2.2.1
 
diff --git a/sources b/sources
index 3f9a249..dc7773c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (odoc-2.2.1.tar.gz) = eb6d56132961f322b9e03ae61c3ae1eb827fd4913ca4ab090589ad0848b772705b2836071f65c6d7a4f88dfdaf1df5f555df748b723bbe62ea41b25ff424bcda
+SHA512 (odoc-2.3.0.tbz) = 66bf5d68e9720756de0bc2b2e44fda684b732bcaa2225e77003f87c3eb0ebb13ef18f2271138441a26efd2f34e1fad13219428024c63f620cc40d25a2016f2a3