diff --git a/docs/conf.py b/docs/conf.py
index 7fdbbf5f7..001edcca2 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -296,7 +296,7 @@
 # texinfo_no_detailmenu = False
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'http://docs.python.org/': None,
-                       'http://docs.scipy.org/doc/numpy/': None,
-                       'http://docs.scipy.org/doc/scipy/reference': None}
+intersphinx_mapping = {'python': ('http://docs.python.org/', None),
+                       'numpy': ('http://docs.scipy.org/doc/numpy/', None),
+                       'scipy': ('http://docs.scipy.org/doc/scipy/reference', None)}
 intersphinx_cache_limit = 10     # days to keep the cached inventories