diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec
index 0ed6e6c..eb2533e 100644
--- a/ghc-pandoc-types.spec
+++ b/ghc-pandoc-types.spec
@@ -1,13 +1,11 @@
-# For Haskell Packaging Guidelines see:
-# - https://fedoraproject.org/wiki/Packaging:Haskell
-# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+# cabal2spec-0.25.2
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
 %global pkg_name pandoc-types
 
-# common part of summary for all the subpackages
 %global common_summary Pandoc data structure library
 
-# main description used for all the subpackages
 %global common_description This package contains definitions for the Pandoc data structure, which\
 is used by pandoc to represent structured documents. These definitions\
 used to live in the pandoc package, but they have been split off, so\
@@ -17,19 +15,20 @@ citeproc-hs) that use them.
 
 Name:           ghc-%{pkg_name}
 Version:        1.8.2
-Release:        1%{?dist}.3
+Release:        2%{?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-containers-prof, ghc-syb-prof
+BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
+# END cabal2spec
+BuildRequires:  ghc-containers-prof
+BuildRequires:  ghc-syb-prof
 
 %description
 %{common_description}
@@ -47,12 +46,21 @@ BuildRequires:  ghc-containers-prof, ghc-syb-prof
 %ghc_lib_install
 
 
-# define the devel and prof subpkgs, devel post[un] scripts, and filelists:
-# ghc-pandoc-types{,devel,prof}.files
-%ghc_lib_package
+%ghc_devel_package
+
+%ghc_devel_description
+
+
+%ghc_devel_post_postun
+
+
+%ghc_files
 
 
 %changelog
+* Thu Jan  5 2012 Jens Petersen <petersen@redhat.com> - 1.8.2-2
+- update to cabal2spec-0.25.2
+
 * Mon Oct 24 2011 Marcela Mašláňová <mmaslano@redhat.com> - 1.8.2-1.3
 - rebuild with new gmp without compat lib