diff --git a/hledger.spec b/hledger.spec
index fffd48f..10bb6ca 100644
--- a/hledger.spec
+++ b/hledger.spec
@@ -1,22 +1,11 @@
 # https://fedoraproject.org/wiki/Packaging:Haskell
-# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
 %global pkg_name hledger
 
-%global common_summary A double-entry accounting tool
-
-%global common_description hledger reads a plain text general journal or time log \
-describing your transactions and displays precise \
-balance and register reports on the console. \
-It is a remix, in haskell, of John Wiegley's excellent c++ \
-ledger.  hledger aims to be a practical, accessible tool \
-for end users and a useful library for finance-minded \
-haskell programmers.
-
 Name:           %{pkg_name}
 Version:        0.17
-Release:        5%{?dist}
-Summary:        %{common_summary}
+Release:        6%{?dist}
+Summary:        A double-entry accounting tool
 
 License:        GPLv3
 URL:            http://hackage.haskell.org/package/%{name}
@@ -47,7 +36,31 @@ BuildRequires:  ghc-utf8-string-devel
 # End cabal-rpm deps
 
 %description
-%{common_description}
+hledger reads a plain text general journal or time log
+describing your transactions and displays precise
+balance and register reports on the console.
+It is a remix, in haskell, of John Wiegley's excellent c++
+ledger.  hledger aims to be a practical, accessible tool
+for end users and a useful library for finance-minded
+haskell programmers.
+
+
+%package -n ghc-%{name}
+Summary:        Haskell %{name} library
+
+%description -n ghc-%{name}
+This package provides the Haskell %{name} shared library.
+
+
+%package -n ghc-%{name}-devel
+Summary:        Haskell %{name} library development files
+Requires:       ghc-compiler = %{ghc_version}
+Requires(post): ghc-compiler = %{ghc_version}
+Requires(postun): ghc-compiler = %{ghc_version}
+Requires:       ghc-%{name} = %{version}-%{release}
+
+%description -n ghc-%{name}-devel
+This package provides the Haskell %{name} library development files.
 
 
 %prep
@@ -66,17 +79,12 @@ cabal-tweak-dep-ver split "== 0.1.*" ">= 0.1"
 %ghc_lib_install
 
 
-%ghc_package
-
-%ghc_description
+%post -n ghc-%{name}-devel
+%ghc_pkg_recache
 
 
-%ghc_devel_package
-
-%ghc_devel_description
-
-
-%ghc_devel_post_postun
+%postun -n ghc-%{name}-devel
+%ghc_pkg_recache
 
 
 %files
@@ -84,10 +92,17 @@ cabal-tweak-dep-ver split "== 0.1.*" ">= 0.1"
 %attr(755,root,root) %{_bindir}/%{name}
 
 
-%ghc_files
+%files -n ghc-%{name} -f ghc-%{name}.files
+%doc LICENSE
+
+
+%files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
 
 
 %changelog
+* Tue Jun 11 2013 Jens Petersen <petersen@redhat.com> - 0.17-6
+- update to new simplified Haskell Packaging Guidelines
+
 * Tue Mar 19 2013 Jens Petersen <petersen@redhat.com> - 0.17-5
 - allow haskeline-0.7