diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index a2e8cc13b0..d102d74e4c 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -372,7 +372,7 @@ def main():
             bb.event.ui_queue = []
             server_connection.terminate()
     else:
-        print("server address: %s, server port: %s" % (server.serverImpl.host, server.serverImpl.port))
+        print("Bitbake server address: %s, server port: %s" % (server.serverImpl.host, server.serverImpl.port))
         return 0
 
     return 1
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index 6f5d98e331..34f65e4721 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -74,6 +74,8 @@ function webserverStartAll()
             if ! cat "${BUILDDIR}/.toastermain.pid" | xargs -I{} kill -0 {} ; then
                 retval=1
                 rm "${BUILDDIR}/.toastermain.pid"
+	    else
+		echo "Webserver address:  0.0.0.0:8000"
             fi
         fi
         return $retval