diff --git a/packages/angular-cli/commands/serve.run.ts b/packages/angular-cli/commands/serve.run.ts
index 4f32703e15f5..2315efac5f33 100644
--- a/packages/angular-cli/commands/serve.run.ts
+++ b/packages/angular-cli/commands/serve.run.ts
@@ -28,6 +28,7 @@ export default function serveRun(commandOptions: ServeTaskOptions) {
   // Check angular version.
   Version.assertAngularVersionIs2_3_1OrHigher(this.project.root);
   commandOptions.liveReloadHost = commandOptions.liveReloadHost || commandOptions.host;
+  commandOptions.public = commandOptions.public || `http://${commandOptions.host}:${commandOptions.port}`;
 
   return checkExpressPort(commandOptions)
     .then(() => autoFindLiveReloadPort(commandOptions))
diff --git a/packages/angular-cli/commands/serve.ts b/packages/angular-cli/commands/serve.ts
index a1af11e528e6..f4cf63c952f5 100644
--- a/packages/angular-cli/commands/serve.ts
+++ b/packages/angular-cli/commands/serve.ts
@@ -31,6 +31,7 @@ export interface ServeTaskOptions {
   i18nFormat?: string;
   locale?: string;
   extractCss?: boolean | null;
+  public?: string;
 }
 
 const ServeCommand = Command.extend({
@@ -105,7 +106,14 @@ const ServeCommand = Command.extend({
     { name: 'i18n-file',       type: String, default: null },
     { name: 'i18n-format',     type: String, default: null },
     { name: 'locale',         type: String, default: null },
-    { name: 'extract-css',    type: Boolean, default: null }
+    { name: 'extract-css',    type: Boolean, default: null },
+    { name: 'locale',         type: String, default: null },
+    {
+      name: 'public',
+      type: String,
+      default: '',
+      description: 'Websocket client URL for webpack-dev-server inline client'
+    }
   ],
 
   run: function(commandOptions: ServeTaskOptions) {
diff --git a/packages/angular-cli/tasks/serve-webpack.ts b/packages/angular-cli/tasks/serve-webpack.ts
index c8879c6e6517..4093e39d8b9a 100644
--- a/packages/angular-cli/tasks/serve-webpack.ts
+++ b/packages/angular-cli/tasks/serve-webpack.ts
@@ -44,7 +44,7 @@ export default Task.extend({
     // This allows for live reload of page when changes are made to repo.
     // https://webpack.github.io/docs/webpack-dev-server.html#inline-mode
     let entryPoints = [
-      `webpack-dev-server/client?http://${serveTaskOptions.host}:${serveTaskOptions.port}/`
+      `webpack-dev-server/client?${serveTaskOptions.public}/`
     ];
     if (serveTaskOptions.hmr) {
       const webpackHmrLink = 'https://webpack.github.io/docs/hot-module-replacement.html';