diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index 8d71123..84feeb9 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -41,6 +41,11 @@ if [ -d "%{buildroot}%{_docdir}/%{name}-%{version}" ]; then\
   echo "%{_docdir}/%{name}-%{version}" >> %{basepkg}%{?ghc_without_shared:-devel}.files\
 fi\
 %endif\
+%if 0%{?1:1}\
+if [ -d "%{buildroot}%{_docdir}/ghc-%{pkgnamever}" ]; then\
+  echo "%{_docdir}/ghc-%{pkgnamever}" >> %{basepkg}%{?ghc_without_shared:-devel}.files\
+fi\
+%endif\
 echo "%{ghclibdir}/package.conf.d/%{pkgnamever}*.conf" >> %{basepkg}-devel.files\
 if [ -d "%{buildroot}%{pkgdir}" ]; then\
 find %{buildroot}%{pkgdir} -type d | sed "s/^/%dir /" >> %{basepkg}-devel.files\
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 131d907..4d54ff8 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -1,7 +1,7 @@
 %global debug_package %{nil}
 
 Name:		ghc-rpm-macros
-Version:	0.11.10.2
+Version:	0.11.11
 Release:	1%{?dist}
 Summary:	Macros for building packages for GHC
 
@@ -58,6 +58,9 @@ EOF
 
 
 %changelog
+* Wed Mar  9 2011 Jens Petersen <petersen@redhat.com> - 0.11.11-1
+- add docdir when subpackaging packages too
+
 * Sun Feb 13 2011 Jens Petersen <petersen@redhat.com> - 0.11.10-1
 - this package is now arch-dependent
 - rename without_shared to ghc_without_shared and without_dynamic