diff --git a/python-sphinx.spec b/python-sphinx.spec
index bc1b7fb..6bba4f7 100644
--- a/python-sphinx.spec
+++ b/python-sphinx.spec
@@ -1,7 +1,7 @@
-# When bootstrapping sphinx in Fedora, we don't yet have sphinxcontrib-websupport
-# Without it we have warnings in docs, but it's not a hard dependency
-# We don't want to support sphinxcontrib-websupport in RHEL, hence disabling the dependency
-%bcond websupport %{undefined rhel}
+# When bootstrapping sphinx in Fedora, we don't yet have sphinxcontrib-*
+# Without the packages, we have warnings in docs, but it's not a hard dependency
+# We don't want to support sphinxcontrib-* in RHEL, hence disabling the dependencies
+%bcond sphinxcontrib %{undefined rhel}
 # Also, we don't have all the tests requirements
 %bcond tests 1
 
@@ -25,7 +25,7 @@ Name:       python-sphinx
 #global     prerel ...
 %global     upstream_version %{general_version}%{?prerel}
 Version:    %{general_version}%{?prerel:~%{prerel}}
-Release:    2%{?dist}
+Release:    3%{?dist}
 Epoch:      1
 Summary:    Python documentation generator
 
@@ -61,7 +61,12 @@ BuildRequires: make
 BuildRequires: python%{python3_pkgversion}-devel
 BuildRequires: pyproject-rpm-macros
 
-%if %{with websupport}
+%if %{with sphinxcontrib}
+# applehelp and jsmath have been orphaned, we cannot use the [docs] extra directly
+BuildRequires: python%{python3_pkgversion}-sphinxcontrib-devhelp
+BuildRequires: python%{python3_pkgversion}-sphinxcontrib-htmlhelp
+BuildRequires: python%{python3_pkgversion}-sphinxcontrib-serializinghtml
+BuildRequires: python%{python3_pkgversion}-sphinxcontrib-qthelp
 BuildRequires: python%{python3_pkgversion}-sphinxcontrib-websupport
 %endif
 
@@ -149,11 +154,9 @@ Recommends:    ImageMagick
 
 # Upstream Requires those, but we have a patch to remove the dependency.
 # We keep them Recommended to preserve the default user experience.
-# (We don't desire them in RHEL.)
-%if %{undefined rhel}
-Recommends:    python%{python3_pkgversion}-sphinxcontrib-applehelp
+%if %{with sphinxcontrib}
+# applehelp and jsmath have been orphaned
 Recommends:    python%{python3_pkgversion}-sphinxcontrib-devhelp
-Recommends:    python%{python3_pkgversion}-sphinxcontrib-jsmath
 Recommends:    python%{python3_pkgversion}-sphinxcontrib-htmlhelp
 Recommends:    python%{python3_pkgversion}-sphinxcontrib-serializinghtml
 Recommends:    python%{python3_pkgversion}-sphinxcontrib-qthelp
@@ -395,6 +398,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib
 
 
 %changelog
+* Thu Nov 16 2023 Miro Hrončok <mhroncok@redhat.com> - 1:7.2.6-3
+- On Fedora, BuildRequire the sphinxcontrib packages to build the documentation
+
 * Wed Nov 08 2023 Miro Hrončok <mhroncok@redhat.com> - 1:7.2.6-2
 - Weaken the runtime dependency on:
   - python3-sphinxcontrib-applehelp