diff --git a/doc/conf.py b/doc/conf.py
index 72eeac0418071c234ad155fadfa92b34ac7b8fe1..f634be2950d90113bf5834c5952d2a584b139270 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -111,7 +111,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 eb915728e7fdee370c82c5b2fade3ae06be97728..50806d572330fe639823b7afc47c0bbc0500ae94 100644
--- a/doc/themes/scikit-learn/layout.html
+++ b/doc/themes/scikit-learn/layout.html
@@ -15,6 +15,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 6181274c9391fad3eb01a9601d411e917c719b4c..377278ead347b29c01f3b130e12a20399a783415 100644
--- a/doc/themes/scikit-learn/static/nature.css_t
+++ b/doc/themes/scikit-learn/static/nature.css_t
@@ -34,7 +34,18 @@ div.header-wrapper {
 div.header {
     /* for the logo to correctly expand when showing results
        but remain cut when not */
-    overflow: hidden; 
+    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;
 }
 
 
diff --git a/doc/themes/scikit-learn/theme.conf b/doc/themes/scikit-learn/theme.conf
index 1cc40044646bb73870088ddc88543c58a3ca083e..e70d4c67d39d623babe17340402fb15fde6e2cf6 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
\ No newline at end of file