diff --git a/ghc-HTTP.spec b/ghc-HTTP.spec
index f9a1ce9..7a7d36a 100644
--- a/ghc-HTTP.spec
+++ b/ghc-HTTP.spec
@@ -10,32 +10,48 @@
 # ghc does not emit debug information
 %define debug_package %{nil}
 
-Name:		ghc-%{pkg_name}
-Version:	3001.1.5
-Release:	1%{?dist}
-Summary:	HTTP library for Haskell
-
-Group:		Development/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)
-Provides:	%{name}-devel = %{version}-%{release}
+Name:           ghc-%{pkg_name}
+Version:        3001.1.5
+Release:        2%{?dist}
+Summary:        HTTP library for Haskell
+
+Group:          Development/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)
+
+Provides:       %{name}-devel = %{version}-%{release}
 # ghc has only been bootstrapped on the following archs:
 ExclusiveArch:  i386 x86_64 ppc
 BuildRequires:  ghc = %{ghc_version}
+%if %{with doc}
+BuildRequires:  ghc-doc = %{ghc_version}
+%endif
 %if %{with prof}
 BuildRequires:  ghc-prof = %{ghc_version}
 %endif
-Requires:	ghc = %{ghc_version}
-Requires(post):	ghc = %{ghc_version}
+Requires:       ghc = %{ghc_version}
+Requires(post): ghc = %{ghc_version}
 Requires(preun): ghc = %{ghc_version}
-Requires(postun): ghc = %{ghc_version}
 
 %description
 A Haskell library for client-side HTTP.
 
 
+%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.
+%endif
+
+
 %if %{with prof}
 %package prof
 Summary: Profiling libraries for %{name}
@@ -72,9 +88,12 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
-%post 
+%post
 %ghc_register_pkg
+
+
 %if %{with doc}
+%post doc
 %ghc_reindex_haddock
 %endif
 
@@ -85,18 +104,22 @@ if [ "$1" -eq 0 ] ; then
 fi
 
 
-%postun
-if [ "$1" -eq 0 ] ; then
 %if %{with doc}
+%postun doc
+if [ "$1" -eq 0 ] ; then
   %ghc_reindex_haddock
-%endif
 fi
+%endif
 
 
 %files -f %{name}.files
 %defattr(-,root,root,-)
 %doc LICENSE
+
+
 %if %{with doc}
+%files doc
+%defattr(-,root,root,-)
 %{pkg_docdir}
 %endif
 
@@ -108,6 +131,9 @@ fi
 
 
 %changelog
+* Fri Feb 13 2009 Jens Petersen <petersen@redhat.com> - 3001.1.5-2
+- sync with latest template and add a doc subpackage
+
 * Tue Dec 23 2008 Jens Petersen <petersen@redhat.com> - 3001.1.5-1
 - update to 3001.1.5
 - use bcond for doc and prof