diff --git a/doc/conf.py b/doc/conf.py
index d3d73cc509a881a2a2f5a8d6a39787763f2ca6d4..b0cf8ad633884d64f24d63599dcc9a1e8ed1be78 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -122,7 +122,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 244d28acd493b4647e5f782f69b30dff3632f9e3..95764e4d4863ed51347f76085350f3e9175f9741 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 %}
@@ -66,7 +75,6 @@
 </script>
 
 </div>
-
           </div> <!-- end navbar -->
           {%- endblock -%}
 
diff --git a/doc/themes/scikit-learn/static/nature.css_t b/doc/themes/scikit-learn/static/nature.css_t
index c1172739fb9254c714e8d252dde43faaf67a7449..f994f7f76fffdb90fb2ccb729dd72cb49053626d 100644
--- a/doc/themes/scikit-learn/static/nature.css_t
+++ b/doc/themes/scikit-learn/static/nature.css_t
@@ -184,6 +184,17 @@ div.rel {
     margin-top: 20px;
 }
 
+/* -------- warning header for old versions --------------------------------*/
+
+div.warning-wrapper {
+    background-color: #ffaaaa;
+    max-width: auto;
+    text-align: center;
+}
+div.warning-wrapper p {
+    margin: 0;
+}
+
 div.sphinxsidebar h3,
 div.sphinxsidebar h4 {
     padding: 5px 10px;
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