diff --git a/src/freedombone b/src/freedombone
index 3d1f780d..45fddaa6 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -1865,8 +1865,8 @@ function mesh_batman_bridge {
   echo '    modprobe batman-adv' >> $batman_script
   echo '    batctl if add $IFACE' >> $batman_script
   echo '    ifconfig $IFACE up' >> $batman_script
-  echo '    avahi-autoipd -D $BRIDGE' >> $batman_script
-  echo '    avahi-autoipd -D $IFACE' >> $batman_script
+  echo '    avahi-autoipd --force-bind --daemonize --wait $BRIDGE' >> $batman_script
+  echo '    avahi-autoipd --force-bind --daemonize --wait $IFACE' >> $batman_script
   echo '    ifconfig bat0 up promisc' >> $batman_script
   echo '' >> $batman_script
   echo '    #Use persistent HWAddr' >> $batman_script
diff --git a/src/freedombone-client b/src/freedombone-client
index 3555b72e..4c7a2235 100755
--- a/src/freedombone-client
+++ b/src/freedombone-client
@@ -239,8 +239,8 @@ function mesh_batman {
   echo '    modprobe batman-adv' >> $batman_script
   echo '    batctl if add $IFACE' >> $batman_script
   echo '    ifconfig $IFACE up' >> $batman_script
-  echo '    avahi-autoipd -D $BRIDGE' >> $batman_script
-  echo '    avahi-autoipd -D $IFACE' >> $batman_script
+  echo '    avahi-autoipd --force-bind --daemonize --wait $BRIDGE' >> $batman_script
+  echo '    avahi-autoipd --force-bind --daemonize --wait $IFACE' >> $batman_script
   echo '    ifconfig bat0 up promisc' >> $batman_script
   echo '' >> $batman_script
   echo '    #Use persistent HWAddr' >> $batman_script