diff --git a/lib/index.js b/lib/index.js
index ef0dbffa..312d37dd 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -118,6 +118,11 @@ class Embark {
           });
         });
 
+        engine.events.on('outputDone', function () {
+          engine.logger.info("Looking for documentation? You can find it at ".cyan + "http://embark.readthedocs.io/".green.underline + ".".cyan);
+          engine.logger.info("Ready".underline);
+        });
+
         engine.deployManager.deployContracts(function (err) {
           engine.startService("fileWatcher");
           if (options.runWebserver) {
@@ -136,8 +141,6 @@ class Embark {
       } else {
         engine.events.emit('firstDeploymentDone');
         engine.events.emit("status", "Ready".green);
-        engine.logger.info("Looking for documentation? you can find it at ".cyan + "http://embark.readthedocs.io/".green.underline);
-        engine.logger.info("Ready".underline);
 
         let size = windowSize.get();
         if (size.height < 40 || size.width < 118) {
@@ -249,7 +252,6 @@ class Embark {
     resetCmd();
   }
 
-  // TODO: should deploy if it hasn't already
   upload(platform, options) {
     
     options.buildDir = 'dist/';