diff --git a/ghc-fgl.spec b/ghc-fgl.spec
index e30a6b9..0bf7a73 100644
--- a/ghc-fgl.spec
+++ b/ghc-fgl.spec
@@ -4,17 +4,17 @@
 
 %global common_description Martin Erwig's Functional Graph Library.
 
-%bcond_without doc
-%bcond_without prof
+%global ghc_pkg_deps ghc-mtl-devel
+
 %bcond_without shared
 
-# ghc does not emit debug information
-#%%global debug_package %{nil}
+# debuginfo is not useful for ghc
+%global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
 # part of haskell-platform-2009.2.0.2
 Version:        5.4.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -23,16 +23,10 @@ URL:            http://web.engr.oregonstate.edu/~erwig/fgl/haskell/
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc, ghc-rpm-macros >= 0.4.0
-BuildRequires:  ghc-mtl-devel
-%if %{with doc}
+BuildRequires:  ghc, ghc-rpm-macros >= 0.5.1
 BuildRequires:  ghc-doc
-BuildRequires:  ghc-mtl-doc
-%endif
-%if %{with prof}
 BuildRequires:  ghc-prof
-BuildRequires:  ghc-mtl-prof
-%endif
+%{?ghc_pkg_deps:BuildRequires:  %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
 
 %description
 %{common_description}
@@ -41,44 +35,7 @@ This package provides the shared library.
 %endif
 
 
-%package devel
-Summary:        %{common_summary} development files
-Group:          Development/Libraries
-%{?ghc_requires}
-Requires:       ghc-mtl-devel
-
-%description devel
-%{common_description}
-
-This package contains the development files.
-
-
-%if %{with doc}
-%package doc
-Summary:        Documentation for %{common_summary}
-Group:          Development/Libraries
-%{?ghc_doc_requires}
-Requires:       ghc-mtl-doc
-
-%description doc
-%{common_description}
-
-This package contains development documentation files.
-%endif
-
-
-%if %{with prof}
-%package prof
-Summary:        Profiling libraries for %{common_summary}
-Group:          Development/Libraries
-%{?ghc_prof_requires}
-Requires:       ghc-mtl-prof
-
-%description prof
-%{common_description}
-
-This package contains the profiling library.
-%endif
+%ghc_lib_package
 
 
 %prep
@@ -86,73 +43,29 @@ This package contains the profiling library.
 
 
 %build
-%cabal_configure --ghc %{?with_prof:-p}
+%cabal_configure --ghc -p
 %cabal build
-%if %{with doc}
 %cabal haddock
-%endif
 
 
 %install
 %cabal_install
 %cabal_pkg_conf
 
-%ghc_gen_filelists %{name}
+%ghc_gen_filelists
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post devel
-ghc-pkg recache
-
-
-%if %{with doc}
-%post doc
-%ghc_reindex_haddock
-%endif
-
-
-%postun devel
-ghc-pkg recache
-
-
-%if %{with doc}
-%postun doc
-if [ "$1" -eq 0 ] ; then
-  %ghc_reindex_haddock
-fi
-%endif
-
-
-%if %{with shared}
-%files -f %{name}.files
-%defattr(-,root,root,-)
-%{_docdir}/%{name}-%{version}
-%endif
-
-
-%files devel -f %{name}-devel.files
-%defattr(-,root,root,-)
-%if %{without shared}
-%{_docdir}/%{name}-%{version}
-%endif
-
-
-%if %{with doc}
-%files doc -f %{name}-doc.files
-%defattr(-,root,root,-)
-%endif
-
-
-%if %{with prof}
-%files prof -f %{name}-prof.files
-%defattr(-,root,root,-)
-%endif
-
-
 %changelog
+* Mon Jan 11 2010 Jens Petersen <petersen@redhat.com> - 5.4.2.2-3
+- update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1:
+- drop doc and prof bcond
+- use common_summary and common_description
+- use ghc_lib_package and ghc_pkg_deps
+
 * Sat Dec 26 2009 Jens Petersen <petersen@redhat.com> - 5.4.2.2-2
 - update for ghc-6.12.1: add shared library support
 - use new ghc*_requires macros: needs ghc-rpm-macros 0.4.0