diff --git a/.gitignore b/.gitignore
index 73e44a5..6ca1666 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /regexpr-0.5.3.tar.gz
+/regexpr-0.5.4.tar.gz
diff --git a/ghc-regexpr.spec b/ghc-regexpr.spec
index fab6289..f0a2f1c 100644
--- a/ghc-regexpr.spec
+++ b/ghc-regexpr.spec
@@ -1,3 +1,7 @@
+# For Haskell Packaging Guidelines see:
+# - https://fedoraproject.org/wiki/Packaging:Haskell
+# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+
 %global pkg_name regexpr
 
 %global common_summary Regular expression like Perl/Ruby in Haskell
@@ -5,24 +9,44 @@
 %global common_description Regular expression library like Perl and Ruby's regular expressions.
 
 Name:           ghc-%{pkg_name}
-Version:        0.5.3
-Release:        5%{?dist}
+Version:        0.5.4
+Release:        1%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        LGPLv3
+# BEGIN: cabal2spec-0.24
 URL:            http://hackage.haskell.org/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
 ExclusiveArch:  %{ghc_arches}
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
 BuildRequires:  hscolour
-BuildRequires:  ghc-HUnit-prof, ghc-mtlparse-prof
+# END: cabal2spec-0.24
+
+BuildRequires:  ghc-HUnit-prof
+BuildRequires:  ghc-mtl-prof
+BuildRequires:  ghc-mtlparse-prof
 
 %description
 %{common_description}
 
 
+%package -n ghc-%{pkg_name}-devel
+Summary:        Development files for %{common_summary}
+Group:          Development/Libraries
+# BEGIN: cabal2spec-0.24
+%{?ghc_devel_requires}
+Obsoletes:      ghc-%{pkg_name}-prof < %{version}-%{release}
+Provides:       ghc-%{pkg_name}-prof = %{version}-%{release}
+# END: cabal2spec-0.24
+
+%description -n ghc-%{pkg_name}-devel
+%{common_description}
+
+This package contains the development files.
+
+
 %prep
 %setup -q -n %{pkg_name}-%{version}
 
@@ -35,10 +59,27 @@ BuildRequires:  ghc-HUnit-prof, ghc-mtlparse-prof
 %ghc_lib_install
 
 
-%ghc_lib_package
+%post -n ghc-%{pkg_name}-devel
+%ghc_pkg_recache
+
+%postun -n ghc-%{pkg_name}-devel
+%ghc_pkg_recache
+
+
+%if %{undefined ghc_without_shared}
+%files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files
+%defattr(-,root,root,-)
+%endif
+
+%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files
+%defattr(-,root,root,-)
 
 
 %changelog
+* Sat Jul 09 2011 Ben Boeckel <mathstuf@gmail.com> - 0.5.4-1
+- Update to 0.5.4
+- Update to cabal2spec-0.24
+
 * Fri Jun 24 2011 Jens Petersen <petersen@redhat.com> - 0.5.3-5
 - BR ghc-Cabal-devel instead of ghc-prof and use ghc_arches (cabal2spec-0.23.2)
 
diff --git a/sources b/sources
index d08f940..07c64d6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-481f5354628cacea8958d457ea6b12b8  regexpr-0.5.3.tar.gz
+524af05d8414a66b1d81078621b733dd  regexpr-0.5.4.tar.gz