diff --git a/python38.changes b/python38.changes
index 848d215..e86c437 100644
--- a/python38.changes
+++ b/python38.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Dec  5 16:55:12 UTC 2020 - Matej Cepl <mcepl@suse.com>
+
+- Add patch sphinx-update-removed-function.patch to no longer call
+  a now removed function and to make documentation build independent of
+  the Sphinx version (bsc#1179630, gh#python/cpython#13236).
+
 -------------------------------------------------------------------
 Wed Dec  2 10:57:45 UTC 2020 - Matej Cepl <mcepl@suse.com>
 
diff --git a/python38.spec b/python38.spec
index ea9a6e3..da70b9d 100644
--- a/python38.spec
+++ b/python38.spec
@@ -152,6 +152,8 @@ Patch29:        bpo-31046_ensurepip_honours_prefix.patch
 # PATCH-FIX-UPSTREAM bsc1167501-invalid-alignment.patch gh#python/cpython#19133 mcepl@suse.com
 # Fix wrong misalignment of pointer to vectorcallfunc
 Patch31:        bsc1167501-invalid-alignment.patch
+# PATCH-FIX-UPSTREAM stop calling removed Sphinx function gh#python/cpython#13236
+Patch32:        sphinx-update-removed-function.patch
 BuildRequires:  automake
 BuildRequires:  fdupes
 BuildRequires:  gmp-devel
@@ -416,6 +418,7 @@ other applications.
 %patch28 -p1
 %patch29 -p1
 %patch31 -p1
+%patch32 -p1
 
 # drop Autoconf version requirement
 sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac
diff --git a/sphinx-update-removed-function.patch b/sphinx-update-removed-function.patch
new file mode 100644
index 0000000..c9278c5
--- /dev/null
+++ b/sphinx-update-removed-function.patch
@@ -0,0 +1,26 @@
+From 960bb883769e5c64a63b014590d75654db87ffb0 Mon Sep 17 00:00:00 2001
+From: Pablo Galindo <Pablogsal@gmail.com>
+Date: Fri, 10 May 2019 22:58:17 +0100
+Subject: [PATCH] Fix sphinx deprecation warning about env.note_versionchange()
+ (GH-13236)
+
+---
+ Doc/tools/extensions/pyspecific.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/Doc/tools/extensions/pyspecific.py
++++ b/Doc/tools/extensions/pyspecific.py
+@@ -361,7 +361,12 @@ class DeprecatedRemoved(Directive):
+                                    translatable=False)
+             node.append(para)
+         env = self.state.document.settings.env
+-        env.get_domain('changeset').note_changeset(node)
++        # new method
++        if hasattr(env, 'get_domain'):
++            env.get_domain('changeset').note_changeset(node)
++        # deprecated pre-Sphinx-2 method
++        else:
++            env.note_versionchange('deprecated', version[0], node, self.lineno)
+         return [node] + messages
+ 
+