diff --git a/doc/conf.py b/doc/conf.py
index 2d4de0f416dc9abf59b96d146b1a8219195012c8..e14757c74103b571ba445393e6575ef7d334c82a 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -30,7 +30,7 @@ extensions = [
     ]
 
 # Be picky about warnings
-nitpicky = False 
+nitpicky = False
 
 # Ignores stuff we can't easily resolve on other project's sphinx manuals
 nitpick_ignore = []
@@ -229,14 +229,18 @@ autodoc_default_flags = [
   'show-inheritance',
   ]
 
+if not 'BOB_DOCUMENTATION_SERVER' in os.environ:
+  # notice we need to overwrite this for BEAT projects - defaults from Bob are
+  # not OK
+  os.environ['BOB_DOCUMENTATION_SERVER'] = "https://www.idiap.ch/software/beat/docs/beat/%(name)s/%(version)s/|https://www.idiap.ch/software/beat/docs/beat/%(name)s/master/"
+
 # For inter-documentation mapping:
 from bob.extension.utils import link_documentation, load_requirements
 sphinx_requirements = "extra-intersphinx.txt"
 if os.path.exists(sphinx_requirements):
   intersphinx_mapping = link_documentation(
       additional_packages=['python','numpy'] + \
-          load_requirements(sphinx_requirements)
-          )
+          load_requirements(sphinx_requirements))
 else:
   intersphinx_mapping = link_documentation()