diff --git a/.gitignore b/.gitignore
index 10faa2d..19b63d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,3 +85,4 @@
 /lpeg-1.0.4.tar.gz
 /pandoc-lua-marshal-0.2.2.tar.gz
 /hslua-list-1.1.1.tar.gz
+/pandoc-cli-0.1.1.1.tar.gz
diff --git a/pandoc.spec b/pandoc.spec
index 0146d08..ac8164c 100644
--- a/pandoc.spec
+++ b/pandoc.spec
@@ -1,8 +1,8 @@
 # generated by cabal-rpm-2.1.2 --subpackage
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
 
-%global pkg_name pandoc
-%global pkgver %{pkg_name}-%{version}
+%global pkg_name pandoc-cli
+%global pandoc_ver 3.0.1
 
 %global hsluamodulesystem hslua-module-system-1.1.0.1
 %global ipynb ipynb-0.2
@@ -20,12 +20,14 @@
 %global hsluamoduleversion hslua-module-version-1.1.0
 %global lpeg lpeg-1.0.4
 %global pandocluamarshal pandoc-lua-marshal-0.2.2
+%global pandoc pandoc-%{pandoc_ver}
+%global pandoccli pandoc-cli-0.1.1.1
 
-%global subpkgs %{hsluamodulesystem} %{ipynb} %{jirawikimarkup} %{unicodecollation} %{citeproc} %{commonmark} %{commonmarkextensions} %{commonmarkpandoc} %{hsluamodulepath} %{base64} %{gridtables} %{hsluamoduledoclayout} %{hsluamoduleversion} %{lpeg} %{hslualist} %{pandocluamarshal}
+%global subpkgs %{hsluamodulesystem} %{ipynb} %{jirawikimarkup} %{unicodecollation} %{citeproc} %{commonmark} %{commonmarkextensions} %{commonmarkpandoc} %{hsluamodulepath} %{base64} %{gridtables} %{hsluamoduledoclayout} %{hsluamoduleversion} %{lpeg} %{hslualist} %{pandocluamarshal} %{pandoc}
 
 # testsuite missing deps: tasty-golden
 
-Name:           %{pkg_name}
+Name:           pandoc
 Version:        3.0.1
 # can only be reset when all subpkgs bumped
 Release:        23%{?dist}
@@ -34,25 +36,26 @@ Summary:        Conversion between markup formats
 License:        GPL-2.0-or-later
 Url:            https://hackage.haskell.org/package/%{name}
 # Begin cabal-rpm sources:
-Source0:        https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
-Source1:        https://hackage.haskell.org/package/%{hsluamodulesystem}/%{hsluamodulesystem}.tar.gz
-Source2:        https://hackage.haskell.org/package/%{ipynb}/%{ipynb}.tar.gz
-Source3:        https://hackage.haskell.org/package/%{jirawikimarkup}/%{jirawikimarkup}.tar.gz
-Source4:        https://hackage.haskell.org/package/%{citeproc}/%{citeproc}.tar.gz
-Source5:        https://hackage.haskell.org/package/%{commonmark}/%{commonmark}.tar.gz
-Source6:        https://hackage.haskell.org/package/%{commonmarkextensions}/%{commonmarkextensions}.tar.gz
-Source7:        https://hackage.haskell.org/package/%{commonmarkpandoc}/%{commonmarkpandoc}.tar.gz
-Source8:        https://hackage.haskell.org/package/%{hsluamodulepath}/%{hsluamodulepath}.tar.gz
-Source9:        https://hackage.haskell.org/package/%{unicodecollation}/%{unicodecollation}.tar.gz
-Source10:       https://hackage.haskell.org/package/%{base64}/%{base64}.tar.gz
-Source11:       https://hackage.haskell.org/package/%{gridtables}/%{gridtables}.tar.gz
-Source12:       https://hackage.haskell.org/package/%{hsluamoduledoclayout}/%{hsluamoduledoclayout}.tar.gz
-Source13:       https://hackage.haskell.org/package/%{hsluamoduleversion}/%{hsluamoduleversion}.tar.gz
-Source14:       https://hackage.haskell.org/package/%{lpeg}/%{lpeg}.tar.gz
-Source15:       https://hackage.haskell.org/package/%{pandocluamarshal}/%{pandocluamarshal}.tar.gz
-Source16:       https://hackage.haskell.org/package/%{hslualist}/%{hslualist}.tar.gz
+Source0:       https://hackage.haskell.org/package/%{pandoccli}/%{pandoccli}.tar.gz
+Source1:        https://hackage.haskell.org/package/%{pandoc}/%{pandoc}.tar.gz
+Source2:        https://hackage.haskell.org/package/%{hsluamodulesystem}/%{hsluamodulesystem}.tar.gz
+Source3:        https://hackage.haskell.org/package/%{ipynb}/%{ipynb}.tar.gz
+Source4:        https://hackage.haskell.org/package/%{jirawikimarkup}/%{jirawikimarkup}.tar.gz
+Source5:        https://hackage.haskell.org/package/%{citeproc}/%{citeproc}.tar.gz
+Source6:        https://hackage.haskell.org/package/%{commonmark}/%{commonmark}.tar.gz
+Source7:        https://hackage.haskell.org/package/%{commonmarkextensions}/%{commonmarkextensions}.tar.gz
+Source8:        https://hackage.haskell.org/package/%{commonmarkpandoc}/%{commonmarkpandoc}.tar.gz
+Source9:        https://hackage.haskell.org/package/%{hsluamodulepath}/%{hsluamodulepath}.tar.gz
+Source10:        https://hackage.haskell.org/package/%{unicodecollation}/%{unicodecollation}.tar.gz
+Source11:       https://hackage.haskell.org/package/%{base64}/%{base64}.tar.gz
+Source12:       https://hackage.haskell.org/package/%{gridtables}/%{gridtables}.tar.gz
+Source13:       https://hackage.haskell.org/package/%{hsluamoduledoclayout}/%{hsluamoduledoclayout}.tar.gz
+Source14:       https://hackage.haskell.org/package/%{hsluamoduleversion}/%{hsluamoduleversion}.tar.gz
+Source15:       https://hackage.haskell.org/package/%{lpeg}/%{lpeg}.tar.gz
+Source16:       https://hackage.haskell.org/package/%{pandocluamarshal}/%{pandocluamarshal}.tar.gz
+Source17:       https://hackage.haskell.org/package/%{hslualist}/%{hslualist}.tar.gz
 # End cabal-rpm sources
-Source17:       https://hackage.haskell.org/package/%{base64}/base64.cabal#/%{base64}.cabal
+Source18:       https://hackage.haskell.org/package/%{base64}/base64.cabal#/%{base64}.cabal
 Patch0:         pandoc-version-disable-hslua.patch
 
 # Begin cabal-rpm deps:
@@ -321,27 +324,6 @@ BuildArch:      noarch
 This package provides the %{name} common data files.
 
 
-%package -n ghc-%{name}
-Summary:        Haskell %{name} library
-Requires:       %{name}-common = %{version}-%{release}
-
-%description -n ghc-%{name}
-This package provides the Haskell %{name} shared library.
-
-
-%package -n ghc-%{name}-devel
-Summary:        Haskell %{name} library development files
-Provides:       ghc-%{name}-static = %{version}-%{release}
-Provides:       ghc-%{name}-static%{?_isa} = %{version}-%{release}
-%if %{defined ghc_version}
-Requires:       ghc-compiler = %{ghc_version}
-%endif
-Requires:       ghc-%{name}%{?_isa} = %{version}-%{release}
-
-%description -n ghc-%{name}-devel
-This package provides the Haskell %{name} library development files.
-
-
 %package pdf
 Summary:        Metapackage for pandoc pdf support
 Requires:       %{name} = %{version}
@@ -357,28 +339,6 @@ To use --latex-engine=xelatex or lualatex, install texlive-collection-xetex
 or texlive-collection-luatex respectively.
 
 
-%if %{with haddock}
-%package -n ghc-%{name}-doc
-Summary:        Haskell %{name} library documentation
-BuildArch:      noarch
-Requires:       ghc-filesystem
-
-%description -n ghc-%{name}-doc
-This package provides the Haskell %{name} library documentation.
-%endif
-
-
-%if %{with ghc_prof}
-%package -n ghc-%{name}-prof
-Summary:        Haskell %{name} profiling library
-Requires:       ghc-%{name}-devel%{?_isa} = %{version}-%{release}
-Supplements:    (ghc-%{name}-devel and ghc-prof)
-
-%description -n ghc-%{name}-prof
-This package provides the Haskell %{name} profiling library.
-%endif
-
-
 %global main_version %{version}
 
 %if %{defined ghclibdir}
@@ -397,6 +357,8 @@ This package provides the Haskell %{name} profiling library.
 %ghc_lib_subpackage -l MIT %{hsluamoduleversion}
 %ghc_lib_subpackage -l MIT %{lpeg}
 %ghc_lib_subpackage -l MIT %{pandocluamarshal}
+%ghc_lib_subpackage -l MIT %{hslualist}
+%ghc_lib_subpackage -l GPL-2.0-or-later %{pandoc}
 %endif
 
 %global version %{main_version}
@@ -404,33 +366,33 @@ This package provides the Haskell %{name} profiling library.
 
 %prep
 # Begin cabal-rpm setup:
-%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16
+%setup -q -n %{pandoccli} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17
 # End cabal-rpm setup
 %ifarch ppc64le
 %patch -P0 -p1 -b .orig
 %endif
-cp -p %{SOURCE17} %{base64}/base64.cabal
+cp -p %{SOURCE18} %{base64}/base64.cabal
 
 
 %build
 # Begin cabal-rpm build:
 %ghc_libs_build %{subpkgs}
-%ghc_lib_build
+%ghc_bin_build
 # End cabal-rpm build
 
 
 %install
 # Begin cabal-rpm install
 %ghc_libs_install %{subpkgs}
-%ghc_lib_install
-mv %{buildroot}%{_ghcdocdir}{,-common}
+%ghc_bin_install
+#mv %{buildroot}%{_ghcdocdir}{,-common}
 # End cabal-rpm install
 
-rm %{buildroot}%{_datadir}/%{pkgver}/COPYRIGHT
+rm %{buildroot}%{_datadir}/%{pandoc}/COPYRIGHT
 
 ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown
 
-install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1
+install -m 0644 -p -D %{pandoc}/man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1
 
 echo %{_bindir}/jira-wiki-markup >> %{jirawikimarkup}/ghc-jira-wiki-markup.files
 
@@ -447,7 +409,9 @@ touch %{buildroot}%{_datadir}/bash-completion/completions/%{name}
 
 
 %files
+%license COPYING.md
 # Begin cabal-rpm files:
+%{_bindir}/pandoc
 # End cabal-rpm files
 %{_bindir}/hsmarkdown
 %{_mandir}/man1/pandoc.1*
@@ -456,31 +420,14 @@ touch %{buildroot}%{_datadir}/bash-completion/completions/%{name}
 
 %files common
 # Begin cabal-rpm files:
-%license COPYING.md
-%doc AUTHORS.md BUGS CONTRIBUTING.md README.md changelog.md
-%{_datadir}/%{pkgver}
+%license %{pandoc}/COPYING.md
+%doc %{pandoc}/AUTHORS.md %{pandoc}/BUGS %{pandoc}/CONTRIBUTING.md %{pandoc}/README.md %{pandoc}/changelog.md
+%{_datadir}/%{pandoc}
 # End cabal-rpm files
 
 %files pdf
 
 
-%files -n ghc-%{name} -f ghc-%{name}.files
-
-
-%files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
-
-
-%if %{with haddock}
-%files -n ghc-%{name}-doc -f ghc-%{name}-doc.files
-%license COPYING.md
-%endif
-
-
-%if %{with ghc_prof}
-%files -n ghc-%{name}-prof -f ghc-%{name}-prof.files
-%endif
-
-
 %changelog
 * Sun Jul 23 2023 Jens Petersen <petersen@redhat.com> - 3.0.1-23
 - https://hackage.haskell.org/package/pandoc-3.0.1/changelog
diff --git a/sources b/sources
index 27cb433..62e601b 100644
--- a/sources
+++ b/sources
@@ -15,3 +15,4 @@ SHA512 (hslua-module-version-1.1.0.tar.gz) = b1856d103fa7ab114176a25fcf2610fa834
 SHA512 (lpeg-1.0.4.tar.gz) = 683af7bc2b695a4058f757de7b45759bbaea790d893109256fb9ee13607f15e765e36aa7df7fff6215d93e4aee480b4e0097a52d261673603e7ae6f632d476c0
 SHA512 (pandoc-lua-marshal-0.2.2.tar.gz) = 4a861beb82d2abd95c4c671c9962c99d5302d1fa44de7d80e6e0896c172a6cd3c3758fc4b51b29667dcec1a6d51385cbe8d8e53c15e6eab761840e39270cfe3d
 SHA512 (hslua-list-1.1.1.tar.gz) = 1b9cc115503239fda71e290e05a42cb0d475b88d59767f67e89775dc4a47ad63245b632e0facc21fb275b4a6098e09d402b0497d1107db01c63579d9a4f0f43a
+SHA512 (pandoc-cli-0.1.1.1.tar.gz) = cdc3b30e6d340f8401698ee6c424410602ab37e50d1165c0a84620d323bfa9cf57bbca5c9740fe3d98025c9ce5f11a587cd97328682830a22c0c07a8d6efbb75