Index: ghc-rpm-macros-1.3.91/macros.ghc
===================================================================
--- ghc-rpm-macros-1.3.91.orig/macros.ghc
+++ ghc-rpm-macros-1.3.91/macros.ghc
@@ -34,7 +34,7 @@ fi
 # libraries doc dir
 %ghclibdocdir %{ghcdocbasedir}/libraries
 # pkg doc dir
-%ghcpkgdocdir %{ghcdocbasedir}/libraries/%{pkg_name}
+%ghcpkgdocdir %{ghcdocbasedir}/libraries/%{pkg_name}-%{version}
 # top library dir
 %ghclibdir %{_libdir}/ghc-%{ghc_version}
 
@@ -50,7 +50,7 @@ else\
 keyname=$(echo %{pkgname} | sed -e "s/-//g" | cut -c 1-5)\
 pkgdir=$(ls -d %{buildroot}%{ghclibdir}/${keyname}_* | sed -e "s@^%{buildroot}@@")\
 fi\
-%define docdir %{ghclibdocdir}/%{pkgname}\
+%define docdir %{ghclibdocdir}/%{pkgnamever}\
 rm -f %{basepkg}.files %{basepkg}-devel.files\
 if [ -d "%{buildroot}${pkgdir}" ]; then\
 echo "%dir ${pkgdir}" >> %{basepkg}.files\
@@ -93,7 +93,7 @@ install -D --mode=0644 %{pkgnamever}.con
 
 # ghc_lib_build_without_haddock [name] [version]
 %ghc_lib_build_without_haddock()\
-%cabal_configure %{!?without_prof:-p} %{?ghc_without_shared:--disable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}} %{?1:--docdir=%{_docdir}/ghc-%1%{!?fedora:-%2} --htmldir=%{ghclibdocdir}/%1} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\
+%cabal_configure %{!?without_prof:-p} %{?ghc_without_shared:--disable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} %{?1:--docdir=%{_docdir}/ghc-%1%{!?fedora:-%2} --htmldir=%{ghclibdocdir}/%1-%2} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\
 %cabal build\
 %{nil}