diff --git a/.travis.yml b/.travis.yml
index a039f0db7..ce1237b77 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ env:
     - KIVY_USE_SETUPTOOLS=1
     - KIVY_SPLIT_EXAMPLES=1
     - SERVER_IP=159.203.106.198
+    - DOC_VERSIONS="stable-1.9.0 stable-1.10 stable master"
 matrix:
   fast_finish: true
   include:
@@ -283,11 +284,17 @@ script:
 
 
 after_success:
-  - if [ "${TRAVIS_OS_NAME}" == "linux" ] && [ "${RUN}" == "docs" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ] && [ "${TRAVIS_BRANCH}" == "master" ]; then
-      openssl aes-256-cbc -K $encrypted_675f1a0c317c_key -iv $encrypted_675f1a0c317c_iv -in ./kivy/tools/travis/id_rsa.enc -out ~/.ssh/id_rsa -d;
-      chmod 600 ~/.ssh/id_rsa;
-      echo -e "Host $SERVER_IP\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config;
-      rsync --delete --force -r -e "ssh -p 2457" ./doc/build/html/ root@$SERVER_IP:/web/docs/;
+  - if [ "${TRAVIS_OS_NAME}" == "linux" ] && [ "${RUN}" == "docs" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
+      for version in $DOC_VERSIONS; do
+        if [ $version == ${TRAVIS_BRANCH} ]; then
+          openssl aes-256-cbc -K $encrypted_675f1a0c317c_key -iv $encrypted_675f1a0c317c_iv -in ./kivy/tools/travis/id_rsa.enc -out ~/.ssh/id_rsa -d;
+          chmod 600 ~/.ssh/id_rsa;
+          echo -e "Host $SERVER_IP\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config;
+          echo "[$(echo $DOC_VERSIONS|tr ' ' ', '|sed -s 's/\([^,]\+\)/"\1"/g')]" > versions.json
+          rsync --force -e "ssh -p 2457" versions.json root@$SERVER_IP:/web/docs/;
+          rsync --delete --force -r -e "ssh -p 2457" ./doc/build/html/ root@$SERVER_IP:/web/docs/$version;
+        fi;
+      done;
     fi;
 
 notifications:
diff --git a/doc/sources/.static/fresh.css b/doc/sources/.static/fresh.css
index 4c5fdfb59..220c1a758 100644
--- a/doc/sources/.static/fresh.css
+++ b/doc/sources/.static/fresh.css
@@ -485,3 +485,12 @@ div.navlink {
 	top: -30px;
 	height: 0px;
 }
+
+#version_selector {
+	width: 100%;
+	-webkit-appearance: none;
+	-moz-appearance: none;
+	border: 1px solid #d0d0d0;
+	padding: 0.5em 1em;
+	background: #ffffff00 url('disclosure_down.png') top right no-repeat;
+}
diff --git a/doc/sources/.templates/layout.html b/doc/sources/.templates/layout.html
index 85e7f7bc1..8a641cf90 100644
--- a/doc/sources/.templates/layout.html
+++ b/doc/sources/.templates/layout.html
@@ -46,6 +46,8 @@
       {%- if not embedded %}{% if not theme_nosidebar|tobool %}
       <div class="sphinxsidebar">
         <div class="sphinxsidebarwrapper">
+            <h3>Version</h3>
+            <select id="version_selector"></select>
             <h3>Quick search</h3>
             <form class="search" action="{{ pathto('search') }}" method="get">
                 &nbsp;
@@ -101,6 +103,7 @@
         COLLAPSE_MODINDEX: false,
         FILE_SUFFIX: '{{ file_suffix }}',
         HAS_SOURCE:  {{ has_source|lower }}
+
       };
     </script>
     {%- for scriptfile in script_files %}
@@ -226,6 +229,30 @@
     g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'pw.js'; s.parentNode.insertBefore(g,s);
   })();
 </script>
+<script>
+  var selector = $("#version_selector");
+
+  selector.on('change', function() {
+    var current = document.location.pathname;
+    // TODO find a better way to replace the current version with the new one
+    var target = current.split('/');
+    target.shift();
+    var prefix = target.shift();
+    target.shift();
+    document.location.pathname = ["", prefix, this.value].concat(target).join('/');
+  });
+
+  var url = "{{ url_root }}/versions.json";
+
+  $.getJSON(url, function(versions) {
+    versions.forEach(function(version){
+      var current = window.location.pathname.split('/')[2]
+      selector.append(
+        $("<option " + (version == current ? "selected" : "") + "/>").val(version).html(version)
+      );
+    });
+  });
+</script>
 <noscript><p><img src="//pw.kivy.org/pw.php?idsite=4&rec=1" style="border:0;" alt="" /></p></noscript>
 <!-- End Piwik Tracking Code -->
     <!--