diff --git a/lib/modules/webserver/index.js b/lib/modules/webserver/index.js
index 285f0f787..555aa2854 100644
--- a/lib/modules/webserver/index.js
+++ b/lib/modules/webserver/index.js
@@ -26,6 +26,7 @@ class WebServer {
     this.events.emit("status", __("Starting Server"));
 
     this.server = new Server({
+      logger: this.logger,
       buildDir: this.buildDir,
       events: this.events,
       host: this.host,
diff --git a/lib/modules/webserver/server.js b/lib/modules/webserver/server.js
index 4cbfa7a08..ef8a54262 100644
--- a/lib/modules/webserver/server.js
+++ b/lib/modules/webserver/server.js
@@ -8,6 +8,7 @@ require('http-shutdown').extend();
 
 class Server {
   constructor(options) {
+    this.logger = options.logger;
     this.buildDir = options.buildDir;
     this.events = options.events;
     this.port = options.port || 8000;
@@ -15,6 +16,11 @@ class Server {
     this.isFirstStart = true;
     this.opened = false;
     this.openBrowser = options.openBrowser;
+
+
+    this.events.once('outputDone', () => {
+      this.logger.info(this._getMessage());
+    });
   }
 
   start(callback) {
@@ -77,14 +83,16 @@ class Server {
       if (err) {
         return callback(err);
       }
-      const msg = (
-        __('webserver available at') + ' ' +
-          ('http://' + canonicalHost(self.hostname) + ':' + self.port).bold.underline.green
-      );
-      callback(null, msg, self.port);
+
+      callback(null, self._getMessage(), self.port);
     });
   }
 
+  _getMessage() {
+    return __('webserver available at') + ' ' +
+    ('http://' + canonicalHost(this.hostname) + ':' + this.port).bold.underline.green;
+  }
+
   stop(callback) {
     if (!this.server || !this.server.listening) {
       return callback(null, __("no webserver is currently running"));
diff --git a/locales/en.json b/locales/en.json
index 1e1bb64e4..4e6888e0e 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -61,7 +61,7 @@
   "error running afterDeploy: ": "error running afterDeploy: ",
   "ready to watch file changes": "ready to watch file changes",
   "Starting Server": "Starting Server",
-  "webserver available at": "webserver available at",
+  "webserver available at": "Webserver available at",
   "Webserver": "Webserver",
   "versions": "versions",
   "possible commands are:": "possible commands are:",
diff --git a/locales/es.json b/locales/es.json
index 7134a301f..f0cf4e109 100644
--- a/locales/es.json
+++ b/locales/es.json
@@ -66,7 +66,7 @@
    "error running afterDeploy: ": "error al ejecutar afterDeploy: ",
    "ready to watch file changes": "listo para monitorear cambios en archivos",
    "Starting Server": "Iniciando el Servidor",
-   "webserver available at": "servidor web disponible en",
+   "webserver available at": "Servidor web disponible en",
    "Webserver": "Servidor web",
    " already deployed at ": " ya desplegado en ",
    "Deployed": "Desplegado",
diff --git a/locales/fr.json b/locales/fr.json
index 0fd64a2ad..11d69ba2a 100644
--- a/locales/fr.json
+++ b/locales/fr.json
@@ -66,7 +66,7 @@
   "error running afterDeploy: ": "erreur d'exécution AfterDeploy: ",
   "ready to watch file changes": "Prêt à monitorer les changements de fichiers",
   "Starting Server": "Démarrage du serveur",
-  "webserver available at": "serveur Web disponible à",
+  "webserver available at": "Serveur Web disponible à",
   "Webserver": "Serveur Web",
   " already deployed at ": " déjà déployé à ",
   "Deployed": "Déployé",
diff --git a/locales/pt.json b/locales/pt.json
index b2c8b1f54..a4af4cf11 100644
--- a/locales/pt.json
+++ b/locales/pt.json
@@ -66,7 +66,7 @@
   "error running afterDeploy: ": "erro ao executar afterDeploy: ",
   "ready to watch file changes": "pronto para monitorar alterações em ficheiros/arquivos",
   "Starting Server": "iniciando o servidor",
-  "webserver available at": "servidor web disponivel em",
+  "webserver available at": "Servidor web disponivel em",
   "Webserver": "servidor web",
   " already deployed at ": " já publicado em ",
   "Deployed": "Publicado",