diff --git a/local-cli/server/runServer.js b/local-cli/server/runServer.js
index c3a39a15a..7d7463a06 100644
--- a/local-cli/server/runServer.js
+++ b/local-cli/server/runServer.js
@@ -44,7 +44,7 @@ function runServer(args, config, readyCallback) {
 
   const serverInstance = http.createServer(app).listen(
     args.port,
-    '::',
+    args.host,
     function() {
       attachHMRServer({
         httpServer: serverInstance,
diff --git a/local-cli/server/server.js b/local-cli/server/server.js
index 3abffb5be..21d1d8e2c 100644
--- a/local-cli/server/server.js
+++ b/local-cli/server/server.js
@@ -30,6 +30,10 @@ function _server(argv, config, resolve, reject) {
     command: 'port',
     default: 8081,
     type: 'string',
+  }, {
+    command: 'host',
+    default: '',
+    type: 'string',
   }, {
     command: 'root',
     type: 'string',