diff --git a/docs/source/_static/css/custom.css b/docs/source/_static/css/custom.css
index 7dfbdc74cf..c7f2ab9999 100644
--- a/docs/source/_static/css/custom.css
+++ b/docs/source/_static/css/custom.css
@@ -179,3 +179,11 @@ a:visited {
     background-position: center top;
     background-origin: content box;
 }
+
+
+/* Version dropdown */
+
+.version-dropdown {
+    border-radius: 4px;
+    border-color: #263673;
+}
\ No newline at end of file
diff --git a/docs/source/_static/versions b/docs/source/_static/versions
new file mode 100644
index 0000000000..25910c55b3
--- /dev/null
+++ b/docs/source/_static/versions
@@ -0,0 +1,11 @@
+{
+	"https://docs.corda.net/releases/release-M6.0": "M6.0",
+	"https://docs.corda.net/releases/release-M7.0": "M7.0",
+	"https://docs.corda.net/releases/release-M8.2": "M8.2",
+	"https://docs.corda.net/releases/release-M9.2": "M9.2",
+	"https://docs.corda.net/releases/release-M10.1": "M10.1",
+	"https://docs.corda.net/releases/release-M11.1": "M11.1",
+	"https://docs.corda.net/releases/release-M12.1": "M12.1",
+	"https://docs.corda.net/releases/release-M13.0": "M13.0",
+	"https://docs.corda.net/head/": "Master"
+}
\ No newline at end of file
diff --git a/docs/source/_templates/layout_for_doc_website.html b/docs/source/_templates/layout_for_doc_website.html
index 841ca935b3..6dcb6f7b12 100644
--- a/docs/source/_templates/layout_for_doc_website.html
+++ b/docs/source/_templates/layout_for_doc_website.html
@@ -10,35 +10,29 @@ API reference: <a href="api/kotlin/corda/index.html">Kotlin</a>/ <a href="api/ja
 <br>
 <a href="http://slack.corda.net">Slack</a>
 <br>
-<select onChange="window.location.href=this.value">
-    <option value="https://docs.corda.net/releases/release-M0.0/">M0.0</option>
-    <option value="https://docs.corda.net/releases/release-M0.1/">M0.1</option>
-    <option value="https://docs.corda.net/releases/release-M1.0/">M1.0</option>
-    <option value="https://docs.corda.net/releases/release-M2.0/">M2.0</option>
-    <option value="https://docs.corda.net/releases/release-M3.0/">M3.0</option>
-    <option value="https://docs.corda.net/releases/release-M4.0/">M4.0</option>
-    <option value="https://docs.corda.net/releases/release-M4.1/">M4.1</option>
-    <option value="https://docs.corda.net/releases/release-M5.0/">M5.0</option>
-    <option value="https://docs.corda.net/releases/release-M6.0/">M6.0</option>
-    <option value="https://docs.corda.net/releases/release-M7.0/">M7.0</option>
-    <option value="https://docs.corda.net/releases/release-M8.0/">M8.0</option>
-    <option value="https://docs.corda.net/releases/release-M8.1/">M8.1</option>
-    <option value="https://docs.corda.net/releases/release-M8.2/">M8.2</option>
-    <option value="https://docs.corda.net/releases/release-M9.0/">M9.0</option>
-    <option value="https://docs.corda.net/releases/release-M9.1/">M9.1</option>
-    <option value="https://docs.corda.net/releases/release-M9.2/">M9.2</option>
-    <option value="https://docs.corda.net/releases/release-M10.1/">M10.1</option>
-    <option value="https://docs.corda.net/releases/release-M11.0/">M11.0</option>
-    <option value="https://docs.corda.net/releases/release-M11.1/">M11.1</option>
-    <option value="https://docs.corda.net/releases/release-M12.0/">M12.0</option>
-    <option value="https://docs.corda.net/releases/release-M12.1/">M12.1</option>
-    <option value="https://docs.corda.net/releases/release-M13.0/" selected>M13.0</option>
-    <option value="https://docs.corda.net/head/">Master</option>
-</select>
+<select id="versionDropdown" class="version-dropdown" onChange="window.location.href=this.value"></select>
 <br>
+<span style="display:none" id="version">{{ version }}</span>
 {% endblock %}
 
 {% block footer %}
+<script>
+    // A synchronous request to retrieve all the Corda versions.
+    $.getJSON("https://docs.corda.net/_static/versions", function(data) {
+        // Grab the current version.
+        var version = $("#version").html();
+
+        // We populate the version dropdown.
+        $.each(data, function(link, text) {
+            if (text === version) {
+                $('#versionDropdown').append($('<option>').text(text).attr('value', link).prop('selected', true));
+            } else {
+                $('#versionDropdown').append($('<option>').text(text).attr('value', link));
+            }
+        });
+    }
+</script>
+
 <script>
   (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
   (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 93d4f89cff..b34fa914f9 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -54,9 +54,11 @@ author = u'R3 DLG'
 # built documents.
 #
 # The short X.Y version.
-version = 'latest'
+version = 'Master'
 # The full version, including alpha/beta/rc tags.
-release = 'latest'
+release = 'Master'
+# The version for use in the dropdown html.
+html_context = {'version': 'Master'}
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.