diff --git a/src/freedombone b/src/freedombone
index dcb68133..0698dc96 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -1821,7 +1821,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 bat0' >> $batman_script
+  echo '    avahi-autoipd -D $IFACE' >> $batman_script
+  echo '    ifconfig $IFACE:avahi netmask 255.255.255.0' >> $batman_script
   echo '    ifconfig bat0 up promisc' >> $batman_script
   echo '' >> $batman_script
   echo '    #Use persistent HWAddr' >> $batman_script
@@ -1864,7 +1865,7 @@ function mesh_batman_bridge {
   echo '        ifconfig $EIFACE down -promisc' >> $batman_script
   echo '    fi' >> $batman_script
   echo '' >> $batman_script
-  echo '    avahi-autoipd -k bat0' >> $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
diff --git a/src/freedombone-client b/src/freedombone-client
index 5ffc8af8..5e739b7e 100755
--- a/src/freedombone-client
+++ b/src/freedombone-client
@@ -232,8 +232,8 @@ function mesh_batman {
   echo '    batctl if add $IFACE' >> $batman_script
   echo '    ifconfig $IFACE up' >> $batman_script
   echo '    avahi-autoipd -D $IFACE' >> $batman_script
-  echo '    ifconfig $IFACE:avahi netmask 255.255.255.0' >> $babel_script
-  echo '    ifconfig bat0 up promisc' >> $babel_script
+  echo '    ifconfig $IFACE:avahi netmask 255.255.255.0' >> $batman_script
+  echo '    ifconfig bat0 up promisc' >> $batman_script
   echo '' >> $batman_script
   echo '    #Use persistent HWAddr' >> $batman_script
   echo '    ether_new=$(ifconfig eth0 | grep HWaddr | sed -e "s/.*HWaddr //")' >> $batman_script