diff --git a/ghc-binary-shared.spec b/ghc-binary-shared.spec
index 8ea678f..9584b75 100644
--- a/ghc-binary-shared.spec
+++ b/ghc-binary-shared.spec
@@ -1,30 +1,27 @@
-# For Haskell Packaging Guidelines see:
-# - https://fedoraproject.org/wiki/Packaging:Haskell
-# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+# cabal2spec-0.25
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+
 %global pkg_name binary-shared
 
-# common part of summary for all the subpackages
 %global common_summary Haskell library for sharing binary elements
 
-# main description used for all the subpackages
 %global common_description Provides capability to share elements created by binary package.
 
 Name:           ghc-%{pkg_name}
 Version:        0.8.1
-Release:        5%{?dist}.2
+Release:        6%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        GPLv2
+# BEGIN cabal2spec
 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
-# macros for building haskell packages
-BuildRequires:  ghc-rpm-macros
-BuildRequires:  hscolour
-BuildRequires:  ghc-binary-prof, ghc-mtl-prof
-
+BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
+# END cabal2spec
 
 %description
 %{common_description}
@@ -41,12 +38,23 @@ BuildRequires:  ghc-binary-prof, ghc-mtl-prof
 %install
 %ghc_lib_install
 
-# define the shared, devel and prof subpkgs, devel scripts,
-# and filelists: ghc-binary-shared.files, ghc-binary-shared-devel.files
-%ghc_lib_package
+
+# devel subpackage
+%ghc_devel_package
+
+%ghc_devel_description
+
+
+%ghc_devel_post_postun
+
+
+%ghc_files LICENSE
 
 
 %changelog
+* Sun Mar 18 2012 Jens Petersen <petersen@redhat.com> - 0.8.1-6
+- update to cabal2spec-0.25
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.1-5.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild