diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 81c73be..6ae58e2 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -183,7 +183,7 @@ EOF
 
 
 %changelog
-* Mon May 16 2022 Jens Petersen <petersen@redhat.com> - 2.3.16-1
+* Wed Jun  8 2022 Jens Petersen <petersen@redhat.com> - 2.3.16-1
 - define ghc_prefix (used for ghcX.Y packaging)
 
 * Wed Apr 27 2022 Jens Petersen <petersen@redhat.com> - 2.3.15-2
diff --git a/macros.ghc b/macros.ghc
index 4f8c7cd..f967f60 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -49,8 +49,11 @@ fi\
 # library package prefix
 %ghc_prefix %{?ghc_name}%{!?ghc_name:ghc}
 
+# top ghcdocdir
+%_ghc_doc_dir %{_docdir}/%{ghc_prefix}
+
 # root dir for ghc docs (used by ghc.spec)
-%ghc_html_dir %{_docdir}/%{ghc_prefix}/html
+%ghc_html_dir %{_ghc_doc_dir}/html
 # deprecates
 %ghcdocbasedir %ghc_html_dir
 
@@ -67,10 +70,10 @@ fi\
 # top library dir
 %ghclibdir %{_libdir}/ghc-%{ghc_version}
 
-%_ghclicensedir %{?_defaultlicensedir}%{!?_defaultlicensedir:%_docdir}
-
 %ghcliblib %{ghclibdir}%{?with_hadrian:/lib}
 
+%_ghclicensedir %{?_defaultlicensedir}%{!?_defaultlicensedir:%_docdir}
+
 # Cabal has specific arch names
 %ghclibplatform %{ghcliblib}%{?with_hadrian:/%(echo %{_arch} | sed -e "s/ppc64le/ppc64/")-linux-ghc-%{ghc_version}}