diff --git a/ghc-monad-control.spec b/ghc-monad-control.spec
index 8b70899..4a4c80a 100644
--- a/ghc-monad-control.spec
+++ b/ghc-monad-control.spec
@@ -1,30 +1,11 @@
 # https://fedoraproject.org/wiki/Packaging:Haskell
-# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
 %global pkg_name monad-control
 
-%global common_summary Lift control operations through monad transformers
-
-%global common_description This package defines the type class MonadBaseControl, a subset of\
-MonadBase into which generic control operations such as catch can be\
-lifted from IO or any other base monad. Instances are based on monad\
-transformers in MonadTransControl, which includes all standard monad\
-transformers in the transformers library except ContT.\
-\
-See the lifted-base package which uses monad-control to lift IO\
-operations from the base library (like catch or bracket) into any\
-monad that is an instance of MonadBase or MonadBaseControl.\
-\
-This package is a rewrite of Anders Kaseorg's monad-peel library.\
-The main difference is that this package provides CPS style operators\
-and exploits the RankNTypes and TypeFamilies language extensions to\
-simplify and speedup most definitions.  A criterion benchmark shows\
-that monad-control is on average about 99% faster than monad-peel.
-
 Name:           ghc-%{pkg_name}
 Version:        0.3.1.4
-Release:        2%{?dist}
-Summary:        %{common_summary}
+Release:        3%{?dist}
+Summary:        Lift control operations through monad transformers
 
 License:        BSD
 URL:            http://hackage.haskell.org/package/%{pkg_name}
@@ -39,7 +20,32 @@ BuildRequires:  ghc-transformers-base-devel
 # End cabal-rpm deps
 
 %description
-%{common_description}
+This package defines the type class MonadBaseControl, a subset of
+MonadBase into which generic control operations such as catch can be
+lifted from IO or any other base monad. Instances are based on monad
+transformers in MonadTransControl, which includes all standard monad
+transformers in the transformers library except ContT.
+
+See the lifted-base package which uses monad-control to lift IO
+operations from the base library (like catch or bracket) into any
+monad that is an instance of MonadBase or MonadBaseControl.
+
+This package is a rewrite of Anders Kaseorg's monad-peel library.
+The main difference is that this package provides CPS style operators
+and exploits the RankNTypes and TypeFamilies language extensions to
+simplify and speedup most definitions.  A criterion benchmark shows
+that monad-control is on average about 99% faster than monad-peel.
+
+
+%package devel
+Summary:        Haskell %{pkg_name} library development files
+Requires:       ghc-compiler = %{ghc_version}
+Requires(post): ghc-compiler = %{ghc_version}
+Requires(postun): ghc-compiler = %{ghc_version}
+Requires:       %{name} = %{version}-%{release}
+
+%description devel
+This package provides the Haskell %{pkg_name} library development files.
 
 
 %prep
@@ -54,19 +60,26 @@ BuildRequires:  ghc-transformers-base-devel
 %ghc_lib_install
 
 
-%ghc_devel_package
-
-%ghc_devel_description
+%post devel
+%ghc_pkg_recache
 
 
-%ghc_devel_post_postun
+%postun devel
+%ghc_pkg_recache
 
 
-%ghc_files LICENSE
+%files -f %{name}.files
+%doc LICENSE
+
+
+%files devel -f %{name}-devel.files
 %doc README.markdown NEWS
 
 
 %changelog
+* Fri Jun 07 2013 Jens Petersen <petersen@redhat.com> - 0.3.1.4-3
+- update to new simplified Haskell Packaging Guidelines
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.1.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild