diff --git a/src/app/shared/navbar/navbar.html b/src/app/shared/navbar/navbar.html
index b426bd988743..691b00ff189e 100644
--- a/src/app/shared/navbar/navbar.html
+++ b/src/app/shared/navbar/navbar.html
@@ -11,9 +11,7 @@
      [routerLink]="key">{{sections[key]}}</a>
   <a mat-button class="docs-navbar-hide-small docs-button" routerLink="guides">Guides</a>
   <div class="flex-spacer"></div>
-  <!-- TODO(tinayuangao): Uncomment this when we are ready for v6
-    <version-picker></version-picker>
-  -->
+  <version-picker></version-picker>
   <theme-picker></theme-picker>
   <a mat-button class="docs-button docs-navbar-hide-small" href="https://github.com/angular/material2"
      aria-label="GitHub Repository">
diff --git a/src/app/shared/version/version.ts b/src/app/shared/version/version.ts
index 1a9502ccd9e8..3ee2b099e1a5 100644
--- a/src/app/shared/version/version.ts
+++ b/src/app/shared/version/version.ts
@@ -13,11 +13,11 @@ export interface VersionInfo {
 // TODO(tinayuangao): Update the title with actual versions
 export const docVersions: VersionInfo[] = [
   {
-    url: 'https://material.angular.io/',
+    url: 'https://v5.material.angular.io/',
     title: '5.2.4'
   },
   {
-    url: `http://v5.material.angular.io`,
-    title: '6.0.0-beta.4'
+    url: `http://material.angular.io`,
+    title: '6.0.0'
   }
 ];