diff --git a/ghc-optparse-simple.spec b/ghc-optparse-simple.spec
index f3ab768..199baf4 100644
--- a/ghc-optparse-simple.spec
+++ b/ghc-optparse-simple.spec
@@ -1,4 +1,4 @@
-# generated by cabal-rpm-0.13
+# generated by cabal-rpm-1.0.0 --subpackage
 # https://fedoraproject.org/wiki/Packaging:Haskell
 
 %global pkg_name optparse-simple
@@ -24,6 +24,12 @@ Source1:        https://hackage.haskell.org/package/%{githash}/%{githash}.tar.gz
 
 # Begin cabal-rpm deps:
 BuildRequires:  ghc-Cabal-devel
+%if %{with haddock}
+BuildRequires:  ghc-doc
+%endif
+%if %{with ghc_prof}
+BuildRequires:  ghc-prof
+%endif
 BuildRequires:  ghc-rpm-macros-extra
 BuildRequires:  chrpath
 #BuildRequires:  ghc-githash-devel
@@ -47,11 +53,8 @@ A simple interface to optparse-applicative.
 %package devel
 Summary:        Haskell %{pkg_name} library development files
 Provides:       %{name}-static = %{version}-%{release}
-Provides:       %{name}-doc = %{version}-%{release}
 %if %{defined ghc_version}
 Requires:       ghc-compiler = %{ghc_version}
-Requires(post): ghc-compiler = %{ghc_version}
-Requires(postun): ghc-compiler = %{ghc_version}
 %endif
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
@@ -60,6 +63,25 @@ This package provides the Haskell %{pkg_name} library development
 files.
 
 
+%if %{with haddock}
+%package doc
+Summary:        Haskell %{pkg_name} library documentation
+
+%description doc
+This package provides the Haskell %{pkg_name} library documentation.
+%endif
+
+
+%if %{with ghc_prof}
+%package prof
+Summary:        Haskell %{pkg_name} profiling library
+Requires:       %{name}-devel%{?_isa} = %{version}-%{release}
+
+%description prof
+This package provides the Haskell %{pkg_name} profiling library.
+%endif
+
+
 %global main_version %{version}
 
 %if %{defined ghclibdir}
@@ -94,14 +116,6 @@ files.
 %cabal_test
 
 
-%post devel
-%ghc_pkg_recache
-
-
-%postun devel
-%ghc_pkg_recache
-
-
 %files -f %{name}.files
 # Begin cabal-rpm files:
 %license LICENSE
@@ -112,6 +126,16 @@ files.
 %doc ChangeLog.md README.md example
 
 
+%if %{with haddock}
+%files doc -f %{name}-doc.files
+%endif
+
+
+%if %{with ghc_prof}
+%files prof -f %{name}-prof.files
+%endif
+
+
 %changelog
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild