diff --git a/macros.ghc b/macros.ghc
index f20863c..e4f7fc5 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -73,8 +73,8 @@ if [ -z "$(ls %{buildroot}%{ghclibdir}/package.conf.d/%{pkgnamever}*.conf)" ]; t
 echo '%{buildroot}%{ghclibdir}/package.conf.d/%{pkgnamever}*.conf not found'\
 exit 1\
 fi\
-rm -f %{basepkg}.files\
-touch %{basepkg}.files\
+rm -f %{basepkg}.files %{basepkg}-doc.files\
+touch %{basepkg}.files %{basepkg}-doc.files\
 ls %{buildroot}%{_ghcdynlibdir}/libHS%{pkgnamever}-*ghc%{ghc_version}.so >> %{basepkg}.files\
 pkgdir="%{ghclibdir}/%{pkgnamever}"\
 if [ -d "%{buildroot}${pkgdir}" ]; then\
@@ -84,7 +84,8 @@ rm -f %{basepkg}-devel.files %{basepkg}-prof.files\
 touch %{basepkg}-devel.files %{basepkg}-prof.files\
 fi\
 ls %{buildroot}%{ghclibdir}/package.conf.d/%{pkgnamever}*.conf >> %{basepkg}-devel.files\
-for i in %{basepkg}.files %{basepkg}-devel.files %{basepkg}-prof.files; do\
+echo %{ghc_html_libraries_dir}/%{pkgnamever} >> %{basepkg}-doc.files\
+for i in %{basepkg}.files %{basepkg}-devel.files %{basepkg}-doc.files %{basepkg}-prof.files; do\
 if [ -f "$i" ]; then\
 sed -i -e "s!%{buildroot}!!g" $i\
 fi\
diff --git a/macros.ghc-extra b/macros.ghc-extra
index 9877eeb..c8b8e38 100644
--- a/macros.ghc-extra
+++ b/macros.ghc-extra
@@ -12,7 +12,6 @@ print(name)\
 local pv = rpm.expand("%1")\
 print(string.sub(pv, string.find(pv, "[%d.]+$")))\
 }}\
-%define pkgnamever %{pkgname}-%{pkgver}\
 %{!-x:%{?1:%global ghc_packages_list %{?ghc_packages_list} %{pkgname}-%{pkgver}}}\
 %define ghc_prefix %{?ghc_name}%{!?ghc_name:ghc}\
 %define basepkg %{ghc_prefix}-%{pkgname}\
@@ -69,8 +68,7 @@ This package provides the Haskell %{pkgname} profiling library.\
 %files -n %{basepkg}-devel -f %{!-d:%{pkgname}-%{pkgver}/}%{basepkg}-devel.files\
 \
 %if %{undefined without_haddock}\
-%files -n %{basepkg}-doc\
-%{ghc_html_libraries_dir}/%{pkgnamever}\
+%files -n %{basepkg}-doc -f %{!-d:%{pkgname}-%{pkgver}/}%{basepkg}-doc.files\
 %endif\
 \
 %if %{undefined without_prof}\