diff --git a/ghc-generic-deriving.spec b/ghc-generic-deriving.spec
index 3a48762..76d4605 100644
--- a/ghc-generic-deriving.spec
+++ b/ghc-generic-deriving.spec
@@ -1,4 +1,4 @@
-# generated by cabal-rpm-0.13
+# generated by cabal-rpm-1.0.0
 # https://fedoraproject.org/wiki/Packaging:Haskell
 
 %global pkg_name generic-deriving
@@ -20,6 +20,12 @@ Source1:        https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#
 
 # 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
 BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-template-haskell-devel
@@ -44,26 +50,33 @@ Template Haskell code is provided for supporting older GHCs.
 %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}
 
 %description devel
-This package provides the Haskell %{pkg_name} library development files.
-
-
-%package devel-doc
-Summary:        Haskell %{pkg_name} library development documentation
-
-BuildArch:      noarch
-
-%description devel-doc
 This package provides the Haskell %{pkg_name} library development
-documentation.
+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
 
 
 %prep
@@ -83,37 +96,29 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal
 # Begin cabal-rpm install
 %ghc_lib_install
 # End cabal-rpm install
-grep -v "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-devel-nodoc.files
-%if %{undefined without_haddock}
-grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-devel-doc.files
-%endif
 
 
 %check
 %cabal_test
 
 
-%post devel
-%ghc_pkg_recache
-
-
-%postun devel
-%ghc_pkg_recache
-
-
 %files -f %{name}.files
 # Begin cabal-rpm files:
 %license LICENSE
 # End cabal-rpm files
 
 
-%files devel -f %{name}-devel-nodoc.files
+%files devel -f %{name}-devel.files
 %doc CHANGELOG.md README.md
 
 
-%if %{undefined without_haddock}
-%files devel-doc -f %{name}-devel-doc.files
-%doc CHANGELOG.md README.md
+%if %{with haddock}
+%files doc -f %{name}-doc.files
+%endif
+
+
+%if %{with ghc_prof}
+%files prof -f %{name}-prof.files
 %endif