diff --git a/SPECS/bind9.16.spec b/SPECS/bind9.16.spec
index eab6118..adab5bd 100644
--- a/SPECS/bind9.16.spec
+++ b/SPECS/bind9.16.spec
@@ -57,7 +57,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind9.16
 License:  MPLv2.0
 Version:  9.16.23
-Release:  0.5%{?dist}
+Release:  0.7%{?dist}
 Epoch:    32
 Url:      https://www.isc.org/downloads/bind/
 #
@@ -372,7 +372,6 @@ This package provides a module which allows commands to be sent to rndc directly
 %package doc
 Summary:   BIND 9 Administrator Reference Manual
 Requires:  %{name}-license = %{epoch}:%{version}-%{release}
-Requires:  python3-sphinx_rtd_theme
 BuildArch: noarch
 
 %description doc
@@ -731,16 +730,17 @@ cp -a build/doc/arm/_build/html ${RPM_BUILD_ROOT}%{_pkgdocdir}
 rm -rf ${RPM_BUILD_ROOT}%{_pkgdocdir}/html/.{buildinfo,doctrees}
 # Backward compatible link to 9.11 documentation
 (cd ${RPM_BUILD_ROOT}%{_pkgdocdir} && ln -s html/index.html Bv9ARM.html)
-# Share static data from original sphinx package
-for DIR in %{python3_sitelib}/sphinx_rtd_theme/static/*
-do
-  BASE=$(basename -- "$DIR")
-  BINDTHEMEDIR="${RPM_BUILD_ROOT}%{_pkgdocdir}/html/_static/$BASE"
-  if [ -d "$BINDTHEMEDIR" ]; then
-    rm -rf "$BINDTHEMEDIR"
-    ln -s "$DIR" "$BINDTHEMEDIR"
-  fi
-done
+# Don't share static data from original sphinx theme package
+# Because RPM is unable to replace symlink to directory with directory,
+# move data copy directory and create link to it.
+pushd "${RPM_BUILD_ROOT}%{_pkgdocdir}/html/_static"
+  for DIR in */
+  do
+    DDATA="${DIR%/}"
+    mv "$DIR" "$DDATA.data"
+    ln -s "$DDATA.data" "$DDATA"
+  done
+popd
 %endif
 %if %{with DOCPDF}
 cp -a build/doc/arm/Bv9ARM.pdf ${RPM_BUILD_ROOT}%{_pkgdocdir}
@@ -1124,6 +1124,13 @@ fi;
 %endif
 
 %changelog
+* Thu Jan 20 2022 Petr Menšík <pemensik@redhat.com> - 32:9.16.23-0.7
+- Keep symlink to static data but keep them in package
+- Workaround to RPM limitation
+
+* Tue Jan 18 2022 Petr Menšík <pemensik@redhat.com> - 32:9.16.23-0.6
+- Make doc static data bundled, omit sphinx dependency
+
 * Wed Jan 12 2022 Petr Menšík <pemensik@redhat.com> - 32:9.16.23-0.5
 - Conflict also with lite-devel and pkcs11-utils subpackages