diff --git a/src/freedombone-utils-avahi b/src/freedombone-utils-avahi
index 848e2370244e1a86f6f9ccbf59790df4ecb907f3..fcbeeae06acf8bb0f3be7d8c3e83b44d44eadee1 100755
--- a/src/freedombone-utils-avahi
+++ b/src/freedombone-utils-avahi
@@ -123,24 +123,20 @@ function mesh_avahi {
 function keep_avahi_running {
     WATCHDOG_SCRIPT_NAME="keepon"
 
-    if [ ! -f "/usr/bin/$WATCHDOG_SCRIPT_NAME" ]; then
-        { echo '#!/bin/bash';
-          echo 'LOGFILE=/var/log/keepon.log';
-          echo "CURRENT_DATE=\$(date)"; } > "/usr/bin/$WATCHDOG_SCRIPT_NAME"
+    if grep -q "avahi daemon" "/usr/bin/$WATCHDOG_SCRIPT_NAME"; then
+        return
     fi
 
-    if ! grep -q "avahi daemon" "/usr/bin/$WATCHDOG_SCRIPT_NAME"; then
-        { echo '';
-          echo '# keep avahi daemon running';
-          echo "AVAHI_RUNNING=\$(systemctl is-active avahi-daemon >/dev/null 2>&1 && echo Running)";
-          echo "if [ ! \$AVAHI_RUNNING ]; then";
-          echo '  systemctl start avahi-daemon';
-          echo "  echo -n \$CURRENT_DATE >> \$LOGFILE";
-          echo "  echo \" Avahi daemon restarted\" >> \$LOGFILE";
-          echo 'fi';
-          echo '# End of avahi'; } >> "/usr/bin/$WATCHDOG_SCRIPT_NAME"
-        chmod +x "/usr/bin/$WATCHDOG_SCRIPT_NAME"
-    fi
+    { echo '';
+      echo '# keep avahi daemon running';
+      echo "AVAHI_RUNNING=\$(systemctl is-active avahi-daemon >/dev/null 2>&1 && echo Running)";
+      echo "if [ ! \$AVAHI_RUNNING ]; then";
+      echo '  systemctl start avahi-daemon';
+      echo "  echo -n \$CURRENT_DATE >> \$LOGFILE";
+      echo "  echo \" Avahi daemon restarted\" >> \$LOGFILE";
+      echo 'fi';
+      echo '# End of avahi'; } >> "/usr/bin/$WATCHDOG_SCRIPT_NAME"
+    chmod +x "/usr/bin/$WATCHDOG_SCRIPT_NAME"
 }
 
 function install_avahi {