diff --git a/.gitignore b/.gitignore
index a591858..c98faa8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /hledger-lib-0.13.tar.gz
 /hledger-lib-0.14.tar.gz
 /hledger-lib-0.16.tar.gz
+/hledger-lib-0.16.1.tar.gz
diff --git a/ghc-hledger-lib.spec b/ghc-hledger-lib.spec
index 996dd2a..885e8f8 100644
--- a/ghc-hledger-lib.spec
+++ b/ghc-hledger-lib.spec
@@ -1,6 +1,6 @@
-# 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 hledger-lib
 
@@ -10,8 +10,8 @@
 it to build hledger and c++-ledger compatible finance tools.
 
 Name:           ghc-%{pkg_name}
-Version:        0.16
-Release:        1%{?dist}.1
+Version:        0.16.1
+Release:        1%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -21,8 +21,7 @@ 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-rpm-macros %{!?without_hscolour:hscolour}
 # END cabal2spec
 
 BuildRequires:  ghc-bytestring-prof
@@ -44,21 +43,6 @@ BuildRequires:  ghc-utf8-string-prof
 %{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}
 
@@ -71,21 +55,21 @@ This package contains the development files.
 %ghc_lib_install
 
 
-%post -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+%ghc_devel_package
 
-%postun -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+%ghc_devel_description
 
 
-%if %{undefined ghc_without_shared}
-%files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files
-%endif
+%ghc_devel_post_postun
 
-%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files
+
+%ghc_files
 
 
 %changelog
+* Wed Jan  4 2012 Jens Petersen <petersen@redhat.com> - 0.16.1-1
+- update to 0.16.1 and cabal2spec-0.25.2
+
 * Mon Oct 24 2011 Marcela Mašláňová <mmaslano@redhat.com> - 0.16-1.1
 - rebuild with new gmp without compat lib
 
diff --git a/sources b/sources
index 82f3518..5f2187d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b1a6a13bd50daf1e588f5777f4d3ea40  hledger-lib-0.16.tar.gz
+fe397ecc85aad9f48e9e279197157734  hledger-lib-0.16.1.tar.gz