diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 28fefa5..4accfe5 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -10,7 +10,7 @@
 #%%global without_hscolour 1
 
 Name:           ghc-rpm-macros
-Version:        2.0.15
+Version:        2.1.0
 Release:        1%{?dist}
 Summary:        RPM macros for building Haskell packages for GHC
 
@@ -55,6 +55,14 @@ Extra macros used for subpackaging of Haskell libraries,
 for example in ghc and haskell-platform.
 
 
+%package -n ghc-filesystem
+Summary:        Shared directories for Haskell documentation
+
+%description -n ghc-filesystem
+This package provides some common directories used for
+Haskell libraries documentation.
+
+
 # ideally packages should be obsoleted by some relevant package
 # this is a last resort when there is no such appropriate package
 %package -n ghc-obsoletes
@@ -140,6 +148,8 @@ install -p -D -m 0755 %{SOURCE11} %{buildroot}/%{_bindir}/cabal-tweak-drop-dep
 install -p -D -m 0755 %{SOURCE12} %{buildroot}/%{_bindir}/cabal-tweak-remove-upperbound
 install -p -D -m 0755 %{SOURCE8} %{buildroot}/%{_prefix}/lib/rpm/ghc-pkg-wrapper
 
+mkdir -p %{buildroot}%{_docdir}/ghc/html/libraries
+
 %if 0%{?rhel} && 0%{?rhel} < 7
 cat >> %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh <<EOF
 
@@ -168,6 +178,13 @@ EOF
 %files extra
 %{macros_dir}/macros.ghc-extra
 
+%files -n ghc-filesystem
+%dir %{_docdir}/ghc
+# %%{ghc_html_dir}
+%dir %{_docdir}/ghc/html
+# %%{ghc_html_libraries_dir}
+%dir %{_docdir}/ghc/html/libraries
+
 
 %if 0%{?fedora} >= 29
 %files -n ghc-obsoletes
@@ -175,6 +192,10 @@ EOF
 
 
 %changelog
+* Wed Mar 24 2021 Jens Petersen <petersen@redhat.com> - 2.1.0-1
+- add ghc-filesystem subpackage to own /usr/share/doc/ghc/{,html/{,libraries/}}
+  and subdirs (#1926757)
+
 * Sat Jan 30 2021 Jens Petersen <petersen@redhat.com> - 2.0.15-1
 - add ghc_fix_doc_perms and use it in ghc_bin_build and ghc_lib_build
 - ghc_lib_subpackage: define ghc_subpackages_list
diff --git a/macros.ghc b/macros.ghc
index c15d449..16c0456 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -98,9 +98,6 @@ fi\
 ls %{buildroot}%{ghclibdir}/package.conf.d/%{pkgnamever}*.conf >> %{basepkg}-devel.files\
 %if %{with haddock}\
 if [ -d %{buildroot}%{ghc_html_libraries_dir}/%{pkgnamever} ]; then\
-echo %dir %{_docdir}/ghc >> %{basepkg}-doc.files\
-echo %dir %{ghc_html_dir} >> %{basepkg}-doc.files\
-echo %dir %{ghc_html_libraries_dir} >> %{basepkg}-doc.files\
 echo %{ghc_html_libraries_dir}/%{pkgnamever} >> %{basepkg}-doc.files\
 fi\
 %endif\
diff --git a/macros.ghc-extra b/macros.ghc-extra
index 640a641..cea1d27 100644
--- a/macros.ghc-extra
+++ b/macros.ghc-extra
@@ -52,6 +52,7 @@ Summary:        Haskell %{pkgname} library documentation\
 %{?1:Version:        %{pkgver}}\
 %{-l:License:        %{-l*}}\
 BuildArch:      noarch\
+Requires:       ghc-filesystem\
 Supplements:    (%{basepkg}-devel and ghc-doc)\
 \
 %description -n %{basepkg}-doc\