diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index 0b0195b..c2bb66a 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -1,7 +1,7 @@
 %cabal %{_bindir}/runhaskell Setup
 
 %cabal_configure \
-%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name}-%{version} --libsubdir='$compiler/$pkgid'
+%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name}-%{version} --htmldir=%{_docdir}/%{hsc_name}/libraries/%{pkg_name} --haddockdir=%{_docdir}/%{hsc_name}/libraries/%{pkg_name} --libsubdir='$compiler/$pkgid'
 
 %cabal_build \
 %cabal build \
@@ -17,7 +17,7 @@ make -f cabal-rpm.mk %{_smp_mflags} \
 %{nil}
 
 %cabal_install \
-%cabal copy --destdir=${RPM_BUILD_ROOT} \
+%cabal copy --destdir=${RPM_BUILD_ROOT} -v \
 %{nil}
 
 %ghc_cabal_configure \
@@ -58,11 +58,11 @@ install -m 755 register.sh unregister.sh ${RPM_BUILD_ROOT}%{pkg_libdir} \
 [ "$1" = 1 ] && %{pkg_libdir}/register.sh >& /dev/null || : \
 %{nil}
 
-%ghc_haddock_reindex \
-if [ -f %{_bindir}/haddock -a -d %{_docdir}/ghc/libraries ]; then \
-cd %{_docdir}/ghc/libraries && \
-haddock --gen-index --gen-contents -o . -t 'Haskell Hierarchical Libraries' \
-$(find . \( \( -path ./ghc -o -path ./ghc-prim \) -prune \) -o \( -name '*.haddock' -print \) \
-| sed 's!.*/\([^/]*\).haddock!--read-interface=\1,\0!'); \
+%ghc_reindex_haddock \
+if [ -f %{_bindir}/haddock -a -d %{_docdir}/%{hsc_name}/libraries ]; then \
+cd %{_docdir}/%{hsc_name}/libraries && \
+haddock --gen-index --gen-contents -o . -t 'Haskell Hierarchical Libraries' \\\
+$(find . \\( \\( -path ./ghc -o -path ./ghc-prim \\) -prune \\) -o \\( -name '*.haddock' -print \\) \\\
+| sed 's!.*/\\([^/]*\\).haddock!--read-interface=\\1,\\0!'); \
 fi \
 %{nil}
diff --git a/ghc.spec b/ghc.spec
index 793abef..5521850 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -16,7 +16,7 @@
 
 Name:		ghc
 Version:	6.10.0.20081007
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Glasgow Haskell Compilation system
 # See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239713
 ExcludeArch:	alpha ppc64
@@ -214,6 +214,9 @@ fi
 
 
 %changelog
+* Tue Oct 14 2008 Bryan O'Sullivan <bos@serpentine.com> - 6.10.0.20081007-6
+- Update macros to install html and haddock bits in the right places
+
 * Tue Oct 14 2008 Bryan O'Sullivan <bos@serpentine.com> - 6.10.0.20081007-5
 - Don't use a macro to update the docs for the main doc package