diff --git a/.cvsignore b/.cvsignore
index 013b0ab..0a3346a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-haskell-src-exts-1.3.0.tar.gz
+haskell-src-exts-1.5.3.tar.gz
diff --git a/ghc-haskell-src-exts.spec b/ghc-haskell-src-exts.spec
index cab5b3b..5aecb69 100644
--- a/ghc-haskell-src-exts.spec
+++ b/ghc-haskell-src-exts.spec
@@ -1,87 +1,51 @@
 %global pkg_name haskell-src-exts
 
-%bcond_without doc
-%bcond_without prof
+%global common_summary Library for Manipulating Haskell source
+
+%global common_description Haskell-Source with Extensions is an extension\
+of the standard haskell-src package, and handles most common syntactic\
+extensions to Haskell, including:\
+* Multi-parameter type classes with functional dependencies\
+* Indexed type families (including associated types)\
+* Empty data declarations\
+* GADTs\
+* Implicit parameters\
+* Template Haskell\
+and a few more. Apart from these standard extensions, it also handles\
+regular patterns as per the HaRP extension as well as HSX-style embedded\
+XML syntax.
+
+%global ghc_pkg_deps ghc-cpphs-devel
+
+%bcond_without shared
 
-# ghc does not emit debug information
+# debuginfo is not useful for ghc
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-Version:        1.3.0
-Release:        2%{?dist}
+Version:        1.5.3
+Release:        1%{?dist}
 Summary:        Library for Manipulating Haskell source
-Group:          Development/Libraries
+Group:          System Environment/Libraries
 License:        BSD
 URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc, ghc-rpm-macros
-BuildRequires:  ghc-cpphs-devel
-BuildRequires:  happy
-%if %{with doc}
+BuildRequires:  ghc, ghc-rpm-macros >= 0.5.1
 BuildRequires:  ghc-doc
-%endif
-%if %{with prof}
 BuildRequires:  ghc-prof
-BuildRequires:  ghc-cpphs-prof
-%endif
+%{?ghc_pkg_deps:BuildRequires:  %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
+BuildRequires:  happy
 
 %description
-Haskell-Source with Extensions (HSE, haskell-src-exts) is an extension
-of the standard haskell-src package, and handles most common syntactic
-extensions to Haskell, including:
-* Multi-parameter type classes with functional dependencies
-* Indexed type families (including associated types)
-* Empty data declarations
-* GADTs
-* Implicit parameters
-* Template Haskell 
-and a few more. Apart from these standard extensions, it also handles
-regular patterns as per the HaRP extension as well as HSX-style embedded
-XML syntax.
-
-
-%package devel
-Summary:        Haskell %{pkg_name} library
-Group:          Development/Libraries
-Requires:       ghc = %{ghc_version}
-Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
-Requires:       ghc-cpphs-devel = %ghc_pkg_ver cpphs
-
-%description devel
-This package contains the development files for %{name}
-built for ghc-%{ghc_version}.
-
-
-%if %{with doc}
-%package doc
-Summary:        Documentation for %{name}
-Group:          Development/Libraries
-Requires:       ghc-doc = %{ghc_version}
-Requires(post): ghc-doc = %{ghc_version}
-Requires(postun): ghc-doc = %{ghc_version}
-
-%description doc
-This package contains development documentation files for the
-%{name} library.
+%{common_description}
+%if %{with shared}
+This package provides the shared library.
 %endif
 
 
-%if %{with prof}
-%package prof
-Summary:        Profiling libraries for %{name}
-Group:          Development/Libraries
-Requires:       %{name}-devel = %{version}-%{release}
-Requires:       ghc-prof = %{ghc_version}
-Requires:       ghc-cpphs-prof = %ghc_pkg_ver cpphs
-
-%description prof
-This package contains profiling libraries for %{name}
-built for ghc-%{ghc_version}.
-%endif
+%ghc_lib_package
 
 
 %prep
@@ -89,67 +53,29 @@ built for ghc-%{ghc_version}.
 
 
 %build
-%cabal_configure --ghc %{?with_prof:-p}
+%cabal_configure --ghc -p
 %cabal build
-%if %{with doc}
 %cabal haddock
-%endif
-%ghc_gen_scripts
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %cabal_install
-%ghc_install_scripts
-%ghc_gen_filelists %{name}
+%cabal_pkg_conf
+
+%ghc_gen_filelists
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post devel
-%ghc_register_pkg
-
-
-%if %{with doc}
-%post doc
-%ghc_reindex_haddock
-%endif
-
-
-%preun devel
-if [ "$1" -eq 0 ] ; then
-  %ghc_unregister_pkg
-fi
-
-
-%if %{with doc}
-%postun doc
-if [ "$1" -eq 0 ] ; then
-  %ghc_reindex_haddock
-fi
-%endif
-
-
-%files devel -f %{name}-devel.files
-%defattr(-,root,root,-)
-%{_docdir}/%{name}-%{version}
-
-
-%if %{with doc}
-%files doc -f %{name}-doc.files
-%defattr(-,root,root,-)
-%endif
-
-
-%if %{with prof}
-%files prof -f %{name}-prof.files
-%defattr(-,root,root,-)
-%endif
-
-
 %changelog
+* Mon Jan 11 2010 Jens Petersen <petersen@redhat.com> - 1.5.3-1
+- update to 1.5.3
+- update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1:
+- drop doc and prof bcond
+- use ghc_lib_package and ghc_pkg_deps
+
 * Mon Nov 16 2009 Jens Petersen <petersen@redhat.com> - 1.3.0-2
 - use %%ghc_pkg_ver for requires
 
diff --git a/sources b/sources
index 9e44a28..148f6eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-740ddf104ff000dfc09feaf71cc63d2d  haskell-src-exts-1.3.0.tar.gz
+15a4235fbff0df69a6589f10562a6f87  haskell-src-exts-1.5.3.tar.gz