diff --git a/src/freedombone b/src/freedombone
index a546093c..1a20e5c5 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -1833,6 +1833,12 @@ function mesh_batman_bridge {
   echo '        brctl addif $BRIDGE $EIFACE' >> $batman_script
   echo '        ifconfig $BRIDGE up' >> $batman_script
   echo '    fi' >> $batman_script
+  echo '' >> $batman_script
+  echo '    if [ -f /bin/systemctl ]; then' >> $batman_script
+  echo '        systemctl restart avahi-daemon' >> $batman_script
+  echo '    else' >> $batman_script
+  echo '        service avahi-daemon restart' >> $batman_script
+  echo '    fi' >> $batman_script
   echo '}' >> $batman_script
   echo '' >> $batman_script
   echo 'stop() {' >> $batman_script
diff --git a/src/freedombone-client b/src/freedombone-client
index 1d139daf..485f5bfd 100755
--- a/src/freedombone-client
+++ b/src/freedombone-client
@@ -167,11 +167,6 @@ function mesh_batman {
   echo '    apt-get -y install avahi-utils avahi-autoipd' >> $batman_script
   echo '    sed -i "s|#host-name=.*|host-name=$(hostname)|g" /etc/avahi/avahi-daemon.conf' >> $batman_script
   echo '    sed -i "s|host-name=.*|host-name=$(hostname)|g" /etc/avahi/avahi-daemon.conf' >> $batman_script
-  echo '    if [ -f /bin/systemctl ]; then' >> $batman_script
-  echo '        systemctl restart avahi-daemon' >> $batman_script
-  echo '    else' >> $batman_script
-  echo '        service avahi-daemon restart' >> $batman_script
-  echo '    fi' >> $batman_script
   echo 'fi' >> $batman_script
   echo '' >> $batman_script
   echo '# Mesh definition' >> $batman_script
@@ -240,6 +235,12 @@ function mesh_batman {
   echo '        brctl addif $BRIDGE $EIFACE' >> $batman_script
   echo '        ifconfig $BRIDGE up' >> $batman_script
   echo '    fi' >> $batman_script
+  echo '' >> $batman_script
+  echo '    if [ -f /bin/systemctl ]; then' >> $batman_script
+  echo '        systemctl restart avahi-daemon' >> $batman_script
+  echo '    else' >> $batman_script
+  echo '        service avahi-daemon restart' >> $batman_script
+  echo '    fi' >> $batman_script
   echo '}' >> $batman_script
   echo '' >> $batman_script
   echo 'stop() {' >> $batman_script