diff --git a/python38.changes b/python38.changes
index 4f05907..dd272fd 100644
--- a/python38.changes
+++ b/python38.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Sep 20 22:19:12 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
+
+- Add sphinx-802.patch to overcome working both with the most
+  recent and older Sphinx versions.
+
 -------------------------------------------------------------------
 Thu Sep 19 00:14:25 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
 
diff --git a/python38.spec b/python38.spec
index dcc8818..98988a5 100644
--- a/python38.spec
+++ b/python38.spec
@@ -196,6 +196,9 @@ Patch48:        CVE-2024-5642-OpenSSL-API-buf-overread-NPN.patch
 # PATCH-FIX-UPSTREAM gh120226-fix-sendfile-test-kernel-610.patch gh#python/cpython#120226 mcepl@suse.com
 # Fix test_sendfile_close_peer_in_the_middle_of_receiving on Linux >= 6.10 (GH-120227)
 Patch50:        gh120226-fix-sendfile-test-kernel-610.patch
+# PATCH-FIX-UPSTREAM sphinx-802.patch mcepl@suse.com
+# status_iterator method moved between the Sphinx versions
+Patch51:        sphinx-802.patch
 
 BuildRequires:  autoconf-archive
 BuildRequires:  automake
@@ -470,6 +473,7 @@ other applications.
 %patch -p1 -P 46
 %patch -p1 -P 48
 %patch -p1 -P 50
+%patch -p1 -P 51
 
 # drop Autoconf version requirement
 sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac
diff --git a/sphinx-802.patch b/sphinx-802.patch
new file mode 100644
index 0000000..c4600b7
--- /dev/null
+++ b/sphinx-802.patch
@@ -0,0 +1,21 @@
+---
+ Doc/tools/extensions/pyspecific.py |    8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+--- a/Doc/tools/extensions/pyspecific.py
++++ b/Doc/tools/extensions/pyspecific.py
+@@ -27,7 +27,13 @@ try:
+ except ImportError:
+     from sphinx.environment import NoUri
+ from sphinx.locale import _ as sphinx_gettext
+-from sphinx.util import status_iterator, logging
++try:
++    from sphinx.util.display import status_iterator
++except ImportError:
++    # This method was moved into sphinx.util.display in Sphinx 6.1.0. Before
++    # that it resided in sphinx.util.
++    from sphinx.util import status_iterator
++from sphinx.util import logging
+ from sphinx.util.nodes import split_explicit_title
+ from sphinx.writers.text import TextWriter, TextTranslator
+ from sphinx.writers.latex import LaTeXTranslator