diff --git a/ghc-zip-archive.spec b/ghc-zip-archive.spec
index 9ed931c..06c8ea4 100644
--- a/ghc-zip-archive.spec
+++ b/ghc-zip-archive.spec
@@ -1,3 +1,7 @@
+# cabal2spec-0.25.2
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+
 %global pkg_name zip-archive
 
 %global common_summary Haskell %{pkg_name} library
@@ -7,18 +11,23 @@ and extracting files from zip archives.
 
 Name:           ghc-%{pkg_name}
 Version:        0.1.1.7
-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
-BuildRequires:  ghc-rpm-macros
-BuildRequires:  hscolour
-BuildRequires:  ghc-binary-prof, ghc-digest-prof, ghc-mtl-prof, ghc-utf8-string-prof, ghc-zlib-prof
+BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
+# END cabal2spec
+BuildRequires:  ghc-binary-prof
+BuildRequires:  ghc-digest-prof
+BuildRequires:  ghc-mtl-prof
+BuildRequires:  ghc-utf8-string-prof
+BuildRequires:  ghc-zlib-prof
 
 %description
 %{common_description}
@@ -35,13 +44,22 @@ BuildRequires:  ghc-binary-prof, ghc-digest-prof, ghc-mtl-prof, ghc-utf8-string-
 %install
 %ghc_lib_install
 
-install -p -m 0644 COPYING %{buildroot}%{_docdir}/%{name}-%{version}
+
+%ghc_devel_package
+
+%ghc_devel_description
 
 
-%ghc_lib_package
+%ghc_devel_post_postun
+
+
+%ghc_files COPYING
 
 
 %changelog
+* Fri Jan  6 2012 Jens Petersen <petersen@redhat.com> - 0.1.1.7-6
+- update to cabal2spec-0.25.2
+
 * Fri Oct 21 2011 Marcela Mašláňová <mmaslano@redhat.com> - 0.1.1.7-5.2
 - rebuild with new gmp without compat lib