diff --git a/ghc-tagsoup.spec b/ghc-tagsoup.spec
index 128f1fc..97dda1c 100644
--- a/ghc-tagsoup.spec
+++ b/ghc-tagsoup.spec
@@ -1,20 +1,11 @@
 # https://fedoraproject.org/wiki/Packaging:Haskell
-# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
 %global pkg_name tagsoup
 
-%global common_summary Parsing and extraction from HTML/XML documents
-
-%global common_description TagSoup is a library for parsing HTML/XML.\
-It supports the HTML 5 specification, and can be used to parse\
-either well-formed XML, or unstructured and malformed HTML from the web.\
-The library also provides useful functions to extract information from\
-an HTML document, making it ideal for screen-scraping.
-
 Name:           ghc-%{pkg_name}
 Version:        0.12.8
-Release:        2%{?dist}
-Summary:        %{common_summary}
+Release:        3%{?dist}
+Summary:        Parsing and extracting from HTML/XML documents
 
 License:        BSD
 URL:            http://hackage.haskell.org/package/%{pkg_name}
@@ -29,7 +20,24 @@ BuildRequires:  ghc-text-devel
 # End cabal-rpm deps
 
 %description
-%{common_description}
+TagSoup is a library for parsing HTML/XML.
+It supports the HTML 5 specification, and can be used to parse
+either well-formed XML, or unstructured and malformed HTML from the web.
+The library also provides useful functions to extract information from
+an HTML document, making it ideal for screen-scraping.
+
+Users should start from the "Text.HTML.TagSoup" module.
+
+
+%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
@@ -44,19 +52,26 @@ BuildRequires:  ghc-text-devel
 %ghc_lib_install
 
 
-%ghc_devel_package
+%post devel
+%ghc_pkg_recache
 
-%ghc_devel_description
 
+%postun devel
+%ghc_pkg_recache
 
-%ghc_devel_post_postun
 
+%files -f %{name}.files
+%doc LICENSE
 
-%ghc_files LICENSE
+
+%files devel -f %{name}-devel.files
 %doc tagsoup.htm
 
 
 %changelog
+* Tue Jun 04 2013 Jens Petersen <petersen@redhat.com> - 0.12.8-3
+- update to new simplified Haskell Packaging Guidelines
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.12.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild