diff --git a/fix-intersphinx-mapping.patch b/fix-intersphinx-mapping.patch
new file mode 100644
index 0000000..1234338
--- /dev/null
+++ b/fix-intersphinx-mapping.patch
@@ -0,0 +1,22 @@
+From 59ef476780398c83eaa4516d2fd3aaaecfb0f9a1 Mon Sep 17 00:00:00 2001
+From: Tres Seaver <tseaver@palladion.com>
+Date: Fri, 24 May 2024 15:12:06 -0400
+Subject: [PATCH] docx: fix intersphinx mapping format
+
+Closes #49.
+---
+ docs/conf.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
+index c399349..6821bba 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -243,4 +243,6 @@
+ 
+ 
+ # Example configuration for intersphinx: refer to the Python standard library.
+-intersphinx_mapping = {'http://docs.python.org/': None}
++intersphinx_mapping = {
++    'python': ('https://docs.python.org/3', None),
++}
diff --git a/python-zope.i18nmessageid.changes b/python-zope.i18nmessageid.changes
index 19c50e0..40ef93b 100644
--- a/python-zope.i18nmessageid.changes
+++ b/python-zope.i18nmessageid.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Sep 11 05:10:50 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Add patch fix-intersphinx-mapping.patch:
+  * Fix the intersphinx mapping.
+- Switch to autosetup macro.
+
 -------------------------------------------------------------------
 Tue Jan  2 21:42:05 UTC 2024 - Dirk Müller <dmueller@suse.com>
 
diff --git a/python-zope.i18nmessageid.spec b/python-zope.i18nmessageid.spec
index 48c281c..7aa234b 100644
--- a/python-zope.i18nmessageid.spec
+++ b/python-zope.i18nmessageid.spec
@@ -1,5 +1,5 @@
 #
-# spec file
+# spec file for package python-zope.i18nmessageid
 #
 # Copyright (c) 2024 SUSE LLC
 # Copyright (c) 2013-2022 LISA GmbH, Bingen, Germany.
@@ -33,6 +33,8 @@ Summary:        Zope Location
 License:        ZPL-2.1
 URL:            https://github.com/zopefoundation/zope.i18nmessageid
 Source:         https://files.pythonhosted.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM gh#zopefoundation/zope.i18nmessageid#59ef476780398c83eaa4516d2fd3aaaecfb0f9a1
+Patch0:         fix-intersphinx-mapping.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module pytest}
@@ -61,7 +63,7 @@ BuildArch:      noarch
 This package contains documentation files for %{name}.
 
 %prep
-%setup -q -n zope.i18nmessageid-%{version}
+%autosetup -p1 -n zope.i18nmessageid-%{version}
 rm -rf zope.i18nmessageid.egg-info
 
 %build