diff --git a/doc/conf.py b/doc/conf.py
index ac78d66cc3f2b37f230140a1168d0905aba29313..22afb222f857fb6fb2f16d461d0dfa7c3ec228a2 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -126,7 +126,7 @@ html_theme = 'scikit-learn'
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-#html_theme_options = {}
+html_theme_options = {'oldversion':True}
 
 # Add any paths that contain custom themes here, relative to this directory.
 html_theme_path = ['themes']
diff --git a/doc/themes/scikit-learn/layout.html b/doc/themes/scikit-learn/layout.html
index 2491c776edd92456af6037026f2c9406eef59058..2094a68f95eff5cce455522cc322dede71bd3cb3 100644
--- a/doc/themes/scikit-learn/layout.html
+++ b/doc/themes/scikit-learn/layout.html
@@ -31,6 +31,15 @@
 {%- endif %}
 
 {% block header %}
+    {%- if theme_oldversion|tobool %}
+     <div class="warning-wrapper">
+       <p>Warning: This documentation is
+         for {{project}} <strong>version {{ release|e }}</strong>.
+         &mdash; <a href="http://scikit-learn.org/stable/">
+           Latest stable version</a></p></p>
+     </div>
+   {%- endif %}
+
     <div class="header-wrapper">
       <div class="header">
         {%- if logo %}
diff --git a/doc/themes/scikit-learn/static/nature.css_t b/doc/themes/scikit-learn/static/nature.css_t
index be4c2f4ac95fdf18e1abe8f3d50d529fc5243594..3a5b632c5be27bee6d97a3935f7253908c24c117 100644
--- a/doc/themes/scikit-learn/static/nature.css_t
+++ b/doc/themes/scikit-learn/static/nature.css_t
@@ -46,6 +46,16 @@ div.header {
     overflow: hidden;
 }
 
+/* -------- warning header for old versions --------------------------------*/
+
+div.warning-wrapper {
+    background-color: #ffaaaa;
+    max-width: auto;
+    text-align: center;
+}
+div.warning-wrapper p {
+    margin: 0;
+}
 
 p.logo {
     margin-top: auto;
diff --git a/doc/themes/scikit-learn/theme.conf b/doc/themes/scikit-learn/theme.conf
index 1cc40044646bb73870088ddc88543c58a3ca083e..bdccd9d9347b4e3d9d4aaeddbd09a7f04418f218 100644
--- a/doc/themes/scikit-learn/theme.conf
+++ b/doc/themes/scikit-learn/theme.conf
@@ -2,3 +2,6 @@
 inherit = basic
 stylesheet = nature.css
 pygments_style = tango
+
+[options]
+oldversion = False