diff --git a/docs/source/api/conf.py b/docs/source/api/conf.py
index 49070338b..cea14a372 100644
--- a/docs/source/api/conf.py
+++ b/docs/source/api/conf.py
@@ -251,7 +251,7 @@ def __getattr__(cls, name):
 autodoc_member_order = 'bysource'
 autoclass_content = 'both'
 intersphinx_mapping = {
-    'python': ('https://docs.python.org/3.8', None),
-    'notmuch': ('https://packages.python.org/notmuch', None),
-    'urwid': ('https://urwid.readthedocs.org/en/latest', None),
+    'python': ('https://docs.python.org/', None),
+    'notmuch': ('https://notmuch.readthedocs.org/en/latest/', None),
+    'urwid': ('https://urwid.readthedocs.org/en/latest/', None),
 }
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 0049d1d01..98761a23d 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -226,7 +226,7 @@
 
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {
-    'https://docs.python.org/': None,
-    'https://notmuch.readthedocs.org/en/latest/': None,
-    'https://urwid.readthedocs.org/en/latest/': None
+    'python': ('https://docs.python.org/', None),
+    'notmuch': ('https://notmuch.readthedocs.org/en/latest/', None),
+    'urwid': ('https://urwid.readthedocs.org/en/latest/', None),
 }