diff --git a/doc/catalog.json b/doc/catalog.json
new file mode 100644
index 0000000000000000000000000000000000000000..98f30b8acdaa0dc0be5153dffd07775e6ed54faf
--- /dev/null
+++ b/doc/catalog.json
@@ -0,0 +1,26 @@
+{
+    "numpy": {
+        "version": {
+            "latest": "https://numpy.org/doc/stable/"
+        },
+        "sources": {
+            "readthedocs": "numpy"
+        }
+    },
+    "matplotlib": {
+        "version": {
+            "latest": "https://matplotlib.org/stable/"
+        },
+        "sources": {
+            "readthedocs": "matplotlib"
+        }
+    },
+    "PIL": {
+        "version": {
+            "latest": "https://pillow.readthedocs.io/en/latest/"
+        },
+        "sources": {
+            "readthedocs": "pillow"
+        }
+    }
+}
diff --git a/doc/conf.py b/doc/conf.py
index 4f68f92f0aca26008e5a8faeb7382f440967291a..7472718a7aaa4ca2bb0e71bd7616946eab639d85 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -106,10 +106,10 @@ autodoc_default_options = {
     "show-inheritance": True,
 }
 
-intersphinx_mapping = {
-    "python": ("https://docs.python.org/3", None),
-    "scipy": ("https://docs.scipy.org/doc/scipy/", None),
-    "numpy": ("https://numpy.org/doc/stable/", None),
-    "matplotlib": ("https://matplotlib.org/stable/", None),
-    "PIL": ("https://pillow.readthedocs.io/en/latest/", None),
-}
+auto_intersphinx_packages = [
+    ("python", "3"),
+    "numpy",
+    "matplotlib",
+    "PIL",
+]
+auto_intersphinx_catalog = "catalog.json"
diff --git a/pyproject.toml b/pyproject.toml
index a4edf544ce2bb4bf56f46b2bb1a2699f9f64b3c1..750b0e1ed589bc43d89c3e5fc6d21465dea1247d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -30,7 +30,7 @@ dependencies = [
 ]
 
 [project.urls]
-documentation = "https://www.idiap.ch/software/bob/docs/bob/bob.io.base/master/"
+documentation = "https://www.idiap.ch/software/bob/docs/bob/bob.io.base/master/sphinx"
 homepage = "https://pypi.org/project/bob.io.base"
 repository = "https://gitlab.idiap.ch/bob/bob.io.base"
 changelog = "https://gitlab.idiap.ch/bob/bob.io.base/-/releases"
@@ -40,6 +40,7 @@ qa = ["pre-commit"]
 doc = [
     "sphinx",
     "sphinx_rtd_theme",
+    "auto-intersphinx",
     ]
 test = [
     "pytest",