diff --git a/src/freedombone b/src/freedombone
index 5bb13a96..916cdcfe 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -1827,6 +1827,7 @@ 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 '    ifconfig bat0 up promisc' >> $batman_script
   echo '' >> $batman_script
@@ -1870,6 +1871,7 @@ function mesh_batman_bridge {
   echo '        ifconfig $EIFACE down -promisc' >> $batman_script
   echo '    fi' >> $batman_script
   echo '' >> $batman_script
+  echo '    avahi-autoipd -k $BRIDGE' >> $batman_script
   echo '    avahi-autoipd -k $IFACE' >> $batman_script
   echo '    ifconfig bat0 down -promisc' >> $batman_script
   echo '' >> $batman_script
diff --git a/src/freedombone-client b/src/freedombone-client
index 06217410..b0f4c5e0 100755
--- a/src/freedombone-client
+++ b/src/freedombone-client
@@ -235,6 +235,7 @@ function mesh_batman {
   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 '    ifconfig bat0 up promisc' >> $batman_script
   echo '' >> $batman_script
   echo '    #Use persistent HWAddr' >> $batman_script
@@ -280,6 +281,7 @@ function mesh_batman {
   echo '    fi' >> $batman_script
   echo '' >> $batman_script
   echo '    avahi-autoipd -k $BRIDGE' >> $batman_script
+  echo '    avahi-autoipd -k $IFACE' >> $batman_script
   echo '    ifconfig bat0 down -promisc' >> $batman_script
   echo '' >> $batman_script
   echo '    batctl if del $IFACE' >> $batman_script