diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index c6ddb90..e568c40 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -48,7 +48,7 @@ echo "%dir %{pkgdir}" >> %{basepkg}.files\
 echo "%attr(755,root,root) %{pkgdir}/libHS%{pkgnamever}-ghc%{ghc_version}.so" >> %{basepkg}.files\
 fi\
 %endif\
-%if 0%{!?1:1} && %{defined ghc_without_shared}\
+%if %{defined ghc_without_shared}\
 if [ "%{name}" = "ghc-%{pkg_name}" ]; then\
   if [ -d "%{buildroot}%{_docdir}/%{name}-%{version}" ]; then\
     mv %{buildroot}%{_docdir}/%{name}-%{version} %{buildroot}%{_docdir}/%{name}-devel-%{version}\
@@ -58,7 +58,7 @@ if [ "%{name}" = "ghc-%{pkg_name}" ]; then\
   fi\
 fi\
 %endif\
-%if 0%{!?1:1} && %{undefined ghc_exclude_docdir}\
+%if %{undefined ghc_exclude_docdir}\
 if [ -d "%{buildroot}%{_docdir}/%{name}-%{version}" ]; then\
   echo "%{_docdir}/%{name}-%{version}" >> %{basepkg}%{?ghc_without_shared:-devel}.files\
 elif [ -d "%{buildroot}%{_docdir}/ghc-%{pkgnamever}" ]; then\
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 6a1e5bb..763ff4b 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -64,6 +64,7 @@ EOF
 - move --disable-library-for-ghci to ghc_lib_build
 - revert back to fallback behaviour for common_summary and common_description
   since it is needed for ghc and haskell-platform subpackaging
+- without ghc_exclude_docdir include doc dir also for subpackages
 
 * Tue Jun  5 2012 Jens Petersen <petersen@redhat.com> - 0.91-1
 - no longer build redundant ghci .o library files