diff --git a/custom-theme/choose_doc_version.html b/custom-theme/choose_doc_version.html
index 1b5fc0f9fc..424824b94a 100644
--- a/custom-theme/choose_doc_version.html
+++ b/custom-theme/choose_doc_version.html
@@ -1,8 +1,12 @@
 <select class="form-control" onchange="if (this.value) window.location.href=this.value">
   <option value="/latest">
+    Version: latest
+  </option>
+
+  <option value="/master/" {% if config.extra.version=="master" %}selected="selected" {% endif %}>
     Version: master
   </option>
-  <option value="/v1_12_0/" {% if config.extra.version=="v1_12_0" %}selected="selected" {% endif %}>
+    <option value="/v1_12_0/" {% if config.extra.version=="v1_12_0" %}selected="selected" {% endif %}>
     Version: 1.12.0
   </option>
   <option value="/v1_11_0/" {% if config.extra.version=="v1_11_0" %}selected="selected" {% endif %}>
diff --git a/docs/documentation.md b/docs/documentation.md
index ca090a86b6..32f5e38456 100644
--- a/docs/documentation.md
+++ b/docs/documentation.md
@@ -1,9 +1,9 @@
 # Apache Mynewt Documentation
 
 -   Latest version:
-    -   [latest](/latest/)
+    -   [1.12.0](/latest/)
+    -   [master (development)](/master/)
 -   Earlier versions:
-    -   [1.12.0](/v1_12_0/)
     -   [1.11.0](/v1_11_0/)
     -   [1.10.0](/v1_10_0/)
     -   [1.9.0](/v1_9_0/)
diff --git a/mkdocs.yml b/mkdocs.yml
index 84f82a3653..dc7864cceb 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -31,7 +31,7 @@ markdown_extensions:
           pygments_style: xcode
 
 extra:
-    version: "master"
+    version: "1.12.0"
     versions:
         - label: "master"
           sha: "master"