diff --git a/dist/server/index.js b/dist/server/index.js
index 8aa0801de3ea..b239c6bc55e5 100755
--- a/dist/server/index.js
+++ b/dist/server/index.js
@@ -55,7 +55,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 var logger = console;
 
-_commander2.default.version(_package2.default.version).option('-p, --port [number]', 'Port to run Storybook (Required)', parseInt).option('-s, --static-dir [dir-name]', 'Directory where to load static files from').option('-c, --config-dir [dir-name]', 'Directory where to load Storybook configurations from').parse(process.argv);
+_commander2.default.version(_package2.default.version).option('-p, --port [number]', 'Port to run Storybook (Required)', parseInt).option('-h, --host [string]', 'Host to run Storybook').option('-s, --static-dir [dir-name]', 'Directory where to load static files from').option('-c, --config-dir [dir-name]', 'Directory where to load Storybook configurations from').parse(process.argv);
 
 if (!_commander2.default.port) {
   logger.error('Error: port to run Storybook is required!\n');
@@ -63,6 +63,13 @@ if (!_commander2.default.port) {
   process.exit(-1);
 }
 
+// Used with `app.listen` below
+var listenAddr = [_commander2.default.port];
+
+if (_commander2.default.host) {
+  listenAddr.push(_commander2.default.host);
+}
+
 var app = (0, _express2.default)();
 
 if (_commander2.default.staticDir) {
@@ -98,10 +105,11 @@ app.get('/iframe.html', function (req, res) {
   res.send((0, _iframe2.default)(headHtml));
 });
 
-app.listen(_commander2.default.port, function (error) {
+app.listen.apply(app, listenAddr.concat([function (error) {
   if (error) {
     throw error;
   } else {
-    logger.info('\nReact Storybook started on => http://localhost:' + _commander2.default.port + '/ \n');
+    var address = 'http://' + (_commander2.default.host || 'localhost') + ':' + _commander2.default.port + '/';
+    logger.info('\nReact Storybook started on => ' + address + '\n');
   }
-});
\ No newline at end of file
+}]));
\ No newline at end of file
diff --git a/src/server/index.js b/src/server/index.js
index dbe282dbc1fc..2737fceb9a95 100755
--- a/src/server/index.js
+++ b/src/server/index.js
@@ -30,8 +30,11 @@ if (!program.port) {
   process.exit(-1);
 }
 
-if (!program.host) {
-  program.host = 'localhost';
+// Used with `app.listen` below
+const listenAddr = [program.port];
+
+if (program.host) {
+  listenAddr.push(program.host);
 }
 
 const app = express();
@@ -69,10 +72,11 @@ app.get('/iframe.html', function (req, res) {
   res.send(getIframeHtml(headHtml));
 });
 
-app.listen(program.port, program.host, function (error) {
+app.listen(...listenAddr, function (error) {
   if (error) {
     throw error;
   } else {
-    logger.info(`\nReact Storybook started on => http://${program.host}:${program.port}/ \n`);
+    const address = `http://${program.host || 'localhost'}:${program.port}/`;
+    logger.info(`\nReact Storybook started on => ${address}\n`);
   }
 });