diff --git a/.gitignore b/.gitignore
index 4935c89..4a11a7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ hlint-1.7.3.tar.gz
 /hlint-1.8.11.tar.gz
 /hlint-1.8.13.tar.gz
 /hlint-1.8.17.tar.gz
+/hlint-1.8.20.tar.gz
diff --git a/hlint.spec b/hlint.spec
index 42d901f..d967cf0 100644
--- a/hlint.spec
+++ b/hlint.spec
@@ -1,3 +1,7 @@
+# cabal2spec-0.25.2
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+
 %global pkg_name hlint
 
 %global common_summary Haskell Source code suggestions
@@ -5,8 +9,8 @@
 %global common_description Hlint gives suggestions on how to improve your source code.
 
 Name:           %{pkg_name}
-Version:        1.8.17
-Release:        1%{?dist}.1
+Version:        1.8.20
+Release:        1%{?dist}
 Summary:        %{common_summary}
 
 Group:          Development/Languages
@@ -16,12 +20,13 @@ URL:            http://hackage.haskell.org/package/%{name}
 Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{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-cpphs-prof, ghc-haskell-src-exts-prof, ghc-uniplate-prof, ghc-hscolour-prof, ghc-transformers-prof
+BuildRequires:  ghc-cpphs-prof
+BuildRequires:  ghc-haskell-src-exts-prof
+BuildRequires:  ghc-uniplate-prof
+BuildRequires:  ghc-hscolour-prof
+BuildRequires:  ghc-transformers-prof
 
 %description
 %{common_description}
@@ -42,7 +47,17 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/hlint.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 
-%ghc_binlib_package
+%ghc_package
+
+%ghc_description
+
+
+%ghc_devel_package
+
+%ghc_devel_description
+
+
+%ghc_devel_post_postun
 
 
 %files
@@ -52,7 +67,13 @@ mv $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/hlint.1 $RPM_BUILD_ROOT%{_mandi
 %{_mandir}/man1/%{name}*
 
 
+%ghc_files
+
+
 %changelog
+* Thu Jan  5 2012 Jens Petersen <petersen@redhat.com> - 1.8.20-1
+- update to 1.8.20 and cabal2spec-0.25.2
+
 * Fri Oct 21 2011 Marcela Mašláňová <mmaslano@redhat.com> - 1.8.17-1.1
 - rebuild with new gmp without compat lib
 
diff --git a/sources b/sources
index 67f913e..2f87c37 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f325a37a7fc9710caaf137c62a2d5baa  hlint-1.8.17.tar.gz
+2dab44f3ef1bce7b195d0b123d152d21  hlint-1.8.20.tar.gz