diff --git a/bin/webpack-dev-server.js b/bin/webpack-dev-server.js
index 4c59e4be53..fd2f9c0205 100755
--- a/bin/webpack-dev-server.js
+++ b/bin/webpack-dev-server.js
@@ -196,7 +196,7 @@ if(options.inline) {
 }
 
 new Server(webpack(wpOpt), options).listen(options.port, options.host, function(err) {
-	var uri = protocol + "://" + options.host + ":" + options.port + "/";
+	var uri = protocol + "://" + (options.public || (options.host + ":" + options.port)) + "/";
 	if(!options.inline)
 		uri += "webpack-dev-server/";