diff --git a/mac/deploy_mac.sh b/mac/deploy_mac.sh
index 1b67c5d7..6b10464d 100755
--- a/mac/deploy_mac.sh
+++ b/mac/deploy_mac.sh
@@ -4,4 +4,6 @@ rm -rf llcon.app
 make clean
 make -j2
 macdeployqt llcon.app -dmg
+zip llcon-version-mac.zip llcon.dmg COPYING
+rm llcon.dmg
 cd mac
diff --git a/src/server.cpp b/src/server.cpp
index 2d283360..fdf49a56 100755
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -355,11 +355,18 @@ void CServer::Start()
 
 void CServer::Stop()
 {
-    // stop timer
-    HighPrecisionTimer.Stop();
+    // Under Mac we have the problem that the timer shutdown might
+    // take some time and therefore we get a lot of "server stopped"
+    // entries in the log. The following condition shall prevent this.
+    // For the other OSs this should not hurt either.
+    if ( IsRunning() )
+    {
+        // stop timer
+        HighPrecisionTimer.Stop();
 
-    // logging (add "server stopped" logging entry)
-    Logging.AddServerStopped();
+        // logging (add "server stopped" logging entry)
+        Logging.AddServerStopped();
+    }
 }
 
 void CServer::OnTimer()