diff --git a/packages/angular/cli/commands/doc-impl.ts b/packages/angular/cli/commands/doc-impl.ts
index 06616ba2ed75..e82638a2efc7 100644
--- a/packages/angular/cli/commands/doc-impl.ts
+++ b/packages/angular/cli/commands/doc-impl.ts
@@ -23,7 +23,11 @@ export class DocCommand extends Command<DocCommandSchema> {
     let domain = 'angular.io';
 
     if (options.version) {
-      domain = `v${options.version}.angular.io`;
+      if (options.version == 'next') {
+        domain = 'next.angular.io';
+      } else {
+        domain = `v${options.version}.angular.io`;  
+      }
     }
 
     let searchUrl = `https://${domain}/api?query=${options.keyword}`;
diff --git a/packages/angular/cli/commands/doc.json b/packages/angular/cli/commands/doc.json
index 30b77405f2e8..f2cb1af5bd1e 100644
--- a/packages/angular/cli/commands/doc.json
+++ b/packages/angular/cli/commands/doc.json
@@ -28,7 +28,18 @@
         },
         "version" : {
           "aliases": ["v"],
-          "type": "string",
+          "anyOf": [
+            {
+              "const" : 2
+            },
+            {
+              "type" : "integer",
+              "minimum": 4
+            },
+            {
+              "const": "next"
+            }
+          ],
           "description": "Contains the version of Angular to use for the documentation."
         }
       },