diff --git a/src/freedombone-utils-avahi b/src/freedombone-utils-avahi
index fcbeeae0..69660c93 100755
--- a/src/freedombone-utils-avahi
+++ b/src/freedombone-utils-avahi
@@ -137,6 +137,14 @@ function keep_avahi_running {
       echo 'fi';
       echo '# End of avahi'; } >> "/usr/bin/$WATCHDOG_SCRIPT_NAME"
     chmod +x "/usr/bin/$WATCHDOG_SCRIPT_NAME"
+
+    # This is a bit of a hack to ensure that avahi services get broadcast
+    # Without this some other systems may not be able to see the server
+    { echo '#!/bin/bash';
+      echo 'systemctl restart avahi-daemon'; } > /usr/bin/restartavahi
+    chmod +x /usr/bin/restartavahi
+
+    cron_add_mins 10 /usr/bin/restartavahi
 }
 
 function install_avahi {