diff --git a/docs/conf.py b/docs/conf.py
index 860f2869..5e573826 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -89,6 +89,7 @@ extensions = [
     'sphinx.ext.autodoc',
     'sphinx.ext.extlinks',
     'sphinx.ext.graphviz',
+    'sphinx.ext.intersphinx',
     'sphinx.ext.viewcode',
 ]
 
@@ -158,3 +159,11 @@ extlinks = {
     'mpris': (
         'https://github.com/mopidy/mopidy-mpris/issues/%s', 'mopidy-mpris#'),
 }
+
+
+# -- Options for intersphinx extension ----------------------------------------
+
+intersphinx_mapping = {
+    'python': ('http://docs.python.org/2', None),
+    'tornado': ('http://www.tornadoweb.org/en/stable/', None),
+}