diff --git a/ghc-xmonad-contrib.spec b/ghc-xmonad-contrib.spec
index 84716f1..8c22161 100644
--- a/ghc-xmonad-contrib.spec
+++ b/ghc-xmonad-contrib.spec
@@ -1,3 +1,7 @@
+# For Haskell Packaging Guidelines see:
+# - https://fedoraproject.org/wiki/Packaging:Haskell
+# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+
 %global pkg_name xmonad-contrib
 
 %global common_summary Third party extensions for xmonad
@@ -15,23 +19,52 @@ your own extensions.
 
 Name:           ghc-%{pkg_name}
 Version:        0.9.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        BSD
+# BEGIN: cabal2spec-0.24
 URL:            http://hackage.haskell.org/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
 ExclusiveArch:  %{ghc_arches}
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
 BuildRequires:  hscolour
-BuildRequires:  ghc-X11-xft-prof, ghc-utf8-string-prof, ghc-xmonad-prof
+# END: cabal2spec-0.24
+
+BuildRequires:  ghc-containers-devel
+BuildRequires:  ghc-directory-devel
+BuildRequires:  ghc-extensible-extensions-devel
+BuildRequires:  ghc-mtl-devel
+BuildRequires:  ghc-old-locale-devel
+BuildRequires:  ghc-old-time-devel
+BuildRequires:  ghc-process-devel
+BuildRequires:  ghc-random-devel
+BuildRequires:  ghc-unix-devel
+BuildRequires:  ghc-utf8-string-devel
+BuildRequires:  ghc-X11-devel
+BuildRequires:  ghc-xmonad-devel
 
 %description
 %{common_description}
 
 
+%package -n ghc-%{pkg_name}-devel
+Summary:        Development files for %{common_summary}
+Group:          Development/Libraries
+# BEGIN: cabal2spec-0.24
+%{?ghc_devel_requires}
+Obsoletes:      ghc-%{pkg_name}-prof < %{version}-%{release}
+Provides:       ghc-%{pkg_name}-prof = %{version}-%{release}
+# END: cabal2spec-0.24
+
+%description -n ghc-%{pkg_name}-devel
+%{common_description}
+
+This package contains the development files.
+
+
 %prep
 %setup -q -n %{pkg_name}-%{version}
 
@@ -44,10 +77,26 @@ BuildRequires:  ghc-X11-xft-prof, ghc-utf8-string-prof, ghc-xmonad-prof
 %ghc_lib_install
 
 
-%ghc_lib_package
+%post -n ghc-%{pkg_name}-devel
+%ghc_pkg_recache
+
+%postun -n ghc-%{pkg_name}-devel
+%ghc_pkg_recache
+
+
+%if %{undefined ghc_without_shared}
+%files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files
+%defattr(-,root,root,-)
+%endif
+
+%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files
+%defattr(-,root,root,-)
 
 
 %changelog
+* Sat Jul 09 2011 Ben Boeckel <mathstuf@gmail.com> - 0.9.2-5
+- Update to cabal2spec-0.24
+
 * Wed Jun 22 2011 Jens Petersen <petersen@redhat.com> - 0.9.2-4
 - BR ghc-Cabal-devel instead of ghc-prof and use ghc_arches (cabal2spec-0.23.2)