diff --git a/_layouts/frontpage2.html b/_layouts/frontpage2.html
index a634cf655..f1cdb670f 100644
--- a/_layouts/frontpage2.html
+++ b/_layouts/frontpage2.html
@@ -61,8 +61,8 @@ <h2 style="font-weight: 700;">Object-Oriented Meets Functional</h2>
       <p class="all-releases"><img src="{{ site.baseurl }}/resources/img/list.png" alt="list icon" /><a href="{{ site.baseurl }}/download/all.html">&nbsp;All Previous Releases</a></p>
     </div>
     <div class="right-side">
-      <p class="getting-started"><b>API: </b><a href="http://www.scala-lang.org/api/current/"><b>Current</b></a> | <a href="http://www.scala-lang.org/files/archive/nightly/2.11.x/api/2.11.x/"><b>Nightly</b></a></p>
-      <p class="dev-releases"><img src="{{ site.baseurl }}/resources/img/list.png" alt="list icon" /><a href="{{ site.baseurl }}/documentation/api.html">&nbsp;All Previous API Docs</a></p>
+      <p class="getting-started"><a href="http://www.scala-lang.org/api/current/"><b>Current API Docs</b></a></p>
+      <p class="dev-releases"><img src="{{ site.baseurl }}/resources/img/list.png" alt="list icon" /><a href="{{ site.baseurl }}/documentation/api.html">&nbsp;API Docs (other versions)</a></p>
       <p class="dev-releases"><img src="{{ site.baseurl }}/resources/img/books.png" alt="books icon" /><a href="{{ site.baseurl }}/documentation/">&nbsp;Scala Documentation</a></p>
       <p class="all-releases"><img src="{{ site.baseurl }}/resources/img/books.png" alt="books icon" /><a href="{{ site.baseurl }}/files/archive/spec/2.11/">&nbsp;Language Specification</a></p>
     </div>
diff --git a/documentation/api.md b/documentation/api.md
index e49030e6d..0fff83239 100644
--- a/documentation/api.md
+++ b/documentation/api.md
@@ -27,8 +27,12 @@ title: Scala API Docs
 
 ## Nightly builds
 
-* [Library API](http://www.scala-lang.org/files/archive/nightly/2.11.x/api/2.11.x/)
-* [Compiler API](http://www.scala-lang.org/files/archive/nightly/2.11.x/api/2.11.x/scala-compiler/)
+* Scala 2.11.x
+  * [Library API](http://www.scala-lang.org/files/archive/nightly/2.11.x/api/2.11.x/)
+  * [Compiler API](http://www.scala-lang.org/files/archive/nightly/2.11.x/api/2.11.x/scala-compiler/)
+* Scala 2.12.x
+  * [Library API](http://www.scala-lang.org/files/archive/nightly/2.12.x/api/2.12.x/)
+  * [Compiler API](http://www.scala-lang.org/files/archive/nightly/2.12.x/api/2.12.x/scala-compiler/)
 
 ## Previous releases
 * Scala 2.11.6