diff --git a/.gitignore b/.gitignore
index 3e5d502..fabe765 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /tagged-0.4.2.tar.gz
 /tagged-0.4.2.1.tar.gz
 /tagged-0.4.4.tar.gz
+/tagged-0.6.tar.gz
diff --git a/ghc-tagged.spec b/ghc-tagged.spec
index 3acebb9..4d86f2d 100644
--- a/ghc-tagged.spec
+++ b/ghc-tagged.spec
@@ -1,16 +1,11 @@
 # https://fedoraproject.org/wiki/Packaging:Haskell
-# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
 %global pkg_name tagged
 
-%global common_summary Newtype wrappers for phantom types
-
-%global common_description Haskell 98 phantom types to avoid unsafely passing dummy arguments.
-
 Name:           ghc-%{pkg_name}
-Version:        0.4.4
-Release:        2%{?dist}
-Summary:        %{common_summary}
+Version:        0.6
+Release:        1%{?dist}
+Summary:        Newtype wrappers for phantom types
 
 License:        BSD
 URL:            http://hackage.haskell.org/package/%{pkg_name}
@@ -18,11 +13,20 @@ Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{versio
 
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
-# Begin cabal-rpm deps:
-# End cabal-rpm deps
 
 %description
-%{common_description}
+Haskell 98 phantom types to avoid unsafely passing dummy arguments.
+
+
+%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
@@ -37,18 +41,27 @@ BuildRequires:  ghc-rpm-macros
 %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 README.markdown CHANGELOG.markdown
 
 
 %changelog
+* Tue Jun 04 2013 Jens Petersen <petersen@redhat.com> - 0.6-1
+- update to 0.6
+- update to new simplified Haskell Packaging Guidelines
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 2a29712..c4ebb6e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2de81344187b2293ba2ba95f07b8ec3b  tagged-0.4.4.tar.gz
+f8f43a49e8c311083d0e1515872c8d48  tagged-0.6.tar.gz