diff --git a/doc-requirements.txt b/doc-requirements.txt
index 348e6cce9a..59c87a4e6f 100644
--- a/doc-requirements.txt
+++ b/doc-requirements.txt
@@ -1,7 +1,7 @@
 # Requirements for building docs
 -r requirements.txt
-# Sphinx >= 1.6 breaks the math_dollar extension
-sphinx<=1.5.6
+sphinx
 numpydoc
 texext
 matplotlib>=1.3
+mock
diff --git a/doc/source/_templates/reggie.html b/doc/source/_templates/reggie.html
new file mode 100644
index 0000000000..835c2570d3
--- /dev/null
+++ b/doc/source/_templates/reggie.html
@@ -0,0 +1 @@
+<p><img src="{{ pathto('_static/reggie.png',1) }}" alt="Reggie -- the one" /></p>
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 9a63ba7e32..d6e14e1a70 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -201,7 +201,7 @@
 #html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-html_sidebars = {'index': 'indexsidebar.html'}
+html_sidebars = {'index': ['localtoc.html', 'relations.html', 'sourcelink.html', 'indexsidebar.html', 'searchbox.html', 'reggie.html']}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.