diff --git a/.gitignore b/.gitignore
index a24abab..f8272a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ hlint-1.7.3.tar.gz
 /hlint-1.8.31.tar.gz
 /hlint-1.8.33.tar.gz
 /hlint-1.8.43.tar.gz
+/hlint-1.8.46.tar.gz
diff --git a/hlint.spec b/hlint.spec
index caaca83..97dfff0 100644
--- a/hlint.spec
+++ b/hlint.spec
@@ -1,16 +1,11 @@
 # https://fedoraproject.org/wiki/Packaging:Haskell
-# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
 %global pkg_name hlint
 
-%global common_summary Haskell Source code suggestions
-
-%global common_description HLint gives suggestions on how to improve your source code.
-
 Name:           %{pkg_name}
-Version:        1.8.43
+Version:        1.8.46
 Release:        1%{?dist}
-Summary:        %{common_summary}
+Summary:        Haskell source code suggestions
 
 License:        GPLv2
 URL:            http://hackage.haskell.org/package/%{name}
@@ -31,7 +26,25 @@ BuildRequires:  ghc-uniplate-devel
 # End cabal-rpm deps
 
 %description
-%{common_description}
+HLint gives suggestions on how to improve your source code.
+
+
+%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
@@ -49,17 +62,12 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/hlint.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 
-%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
@@ -69,10 +77,20 @@ mv $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/hlint.1 $RPM_BUILD_ROOT%{_mandi
 %{_mandir}/man1/%{name}*
 
 
-%ghc_files LICENSE
+%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> - 1.8.46-2
+- update to new simplified Haskell Packaging Guidelines
+
+* Tue Jun 11 2013 Jens Petersen <petersen@redhat.com> - 1.8.46-1
+- update to 1.8.46
+
 * Tue Mar 12 2013 Jens Petersen <petersen@redhat.com> - 1.8.43-1
 - update to 1.8.43
 
diff --git a/sources b/sources
index 4f95a45..a29bde8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2bab7521b5e50dec3454c3e29be656b6  hlint-1.8.43.tar.gz
+7a329462133f702a60fd3150b8b7ac36  hlint-1.8.46.tar.gz