diff --git a/ghc-tagged.spec b/ghc-tagged.spec
index 5fb9e27..c62ada5 100644
--- a/ghc-tagged.spec
+++ b/ghc-tagged.spec
@@ -1,18 +1,16 @@
-# 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 tagged
 
-# common part of summary for all the subpackages
 %global common_summary Newtype wrappers for phantom types
 
-# main description used for all the subpackages
 %global common_description Newtype wrappers for phantom types to avoid unsafely passing dummy arguments. 
 
 Name:           ghc-%{pkg_name}
 Version:        0.2.3.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -22,32 +20,15 @@ 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
-%if %{undefined without_hscolour}
-BuildRequires:  hscolour
-%endif
+BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
 # END cabal2spec
-BuildRequires:   ghc-data-default-prof, ghc-semigroups-prof
+BuildRequires:   ghc-data-default-prof
+BuildRequires:   ghc-semigroups-prof
 
 %description
 %{common_description}
 
 
-%package -n ghc-%{pkg_name}-devel
-Summary:        Development files for %{common_summary}
-Group:          Development/Libraries
-# BEGIN cabal2spec
-%{?ghc_devel_requires}
-Obsoletes:      ghc-%{pkg_name}-prof < %{version}-%{release}
-Provides:       ghc-%{pkg_name}-prof = %{version}-%{release}
-# END cabal2spec
-
-%description -n ghc-%{pkg_name}-devel
-%{common_description}
-
-This package contains the development files.
-
-
 %prep
 %setup -q -n %{pkg_name}-%{version}
 
@@ -60,23 +41,22 @@ This package contains the development files.
 %ghc_lib_install
 
 
-%post -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+# devel subpackage
+%ghc_devel_package
 
+%ghc_devel_description
 
-%postun -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
 
+%ghc_devel_post_postun
 
-%if %{undefined ghc_without_shared}
-%files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files
-%endif
 
-
-%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files
+%ghc_files LICENSE
 
 
 %changelog
+* Sun Mar 18 2012 Jens Petersen <petersen@redhat.com> - 0.2.3.1-4
+- update to cabal2spec-0.25
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild