diff --git a/src/freedombone b/src/freedombone
index 874df43e..f351e4e3 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -5828,11 +5828,11 @@ function configure_firewall_for_avahi {
       return
   fi
   iptables -A INPUT -p tcp -m state -m tcp --dport 548 --state NEW -j ACCEPT
-  iptables -A INPUT -p tcp -m state -m udp --dport 548 --state NEW -j ACCEPT
+  iptables -A INPUT -p udp -m state -m udp --dport 548 --state NEW -j ACCEPT
   iptables -A INPUT -p tcp -m state -m tcp --dport 5353 --state NEW -j ACCEPT
-  iptables -A INPUT -p tcp -m state -m udp --dport 5353 --state NEW -j ACCEPT
+  iptables -A INPUT -p udp -m state -m udp --dport 5353 --state NEW -j ACCEPT
   iptables -A INPUT -p tcp -m state -m tcp --dport 5354 --state NEW -j ACCEPT
-  iptables -A INPUT -p tcp -m state -m udp --dport 5354 --state NEW -j ACCEPT
+  iptables -A INPUT -p udp -m state -m udp --dport 5354 --state NEW -j ACCEPT
   save_firewall_settings
   echo 'configure_firewall_for_avahi' >> $COMPLETION_FILE
 }
diff --git a/src/freedombone-client b/src/freedombone-client
index 9ef6e7a0..3348e2f4 100755
--- a/src/freedombone-client
+++ b/src/freedombone-client
@@ -284,11 +284,11 @@ function mesh_batman {
   echo '    fi' >> $batman_script
   echo '' >> $batman_script
   echo '    iptables -A INPUT -p tcp -m state -m tcp --dport 548 --state NEW -j ACCEPT' >> $batman_script
-  echo '    iptables -A INPUT -p tcp -m state -m udp --dport 548 --state NEW -j ACCEPT' >> $batman_script
+  echo '    iptables -A INPUT -p udp -m state -m udp --dport 548 --state NEW -j ACCEPT' >> $batman_script
   echo '    iptables -A INPUT -p tcp -m state -m tcp --dport 5353 --state NEW -j ACCEPT' >> $batman_script
-  echo '    iptables -A INPUT -p tcp -m state -m udp --dport 5353 --state NEW -j ACCEPT' >> $batman_script
+  echo '    iptables -A INPUT -p udp -m state -m udp --dport 5353 --state NEW -j ACCEPT' >> $batman_script
   echo '    iptables -A INPUT -p tcp -m state -m tcp --dport 5354 --state NEW -j ACCEPT' >> $batman_script
-  echo '    iptables -A INPUT -p tcp -m state -m udp --dport 5354 --state NEW -j ACCEPT' >> $batman_script
+  echo '    iptables -A INPUT -p udp -m state -m udp --dport 5354 --state NEW -j ACCEPT' >> $batman_script
   echo '' >> $batman_script
   echo '    if [ -f /bin/systemctl ]; then' >> $batman_script
   echo '        systemctl restart avahi-daemon' >> $batman_script
@@ -321,11 +321,11 @@ function mesh_batman {
   echo '    iwconfig $IFACE mode managed' >> $batman_script
   echo '' >> $batman_script
   echo '    iptables -D INPUT -p tcp -m state -m tcp --dport 548 --state NEW -j ACCEPT' >> $batman_script
-  echo '    iptables -D INPUT -p tcp -m state -m udp --dport 548 --state NEW -j ACCEPT' >> $batman_script
+  echo '    iptables -D INPUT -p udp -m state -m udp --dport 548 --state NEW -j ACCEPT' >> $batman_script
   echo '    iptables -D INPUT -p tcp -m state -m tcp --dport 5353 --state NEW -j ACCEPT' >> $batman_script
-  echo '    iptables -D INPUT -p tcp -m state -m udp --dport 5353 --state NEW -j ACCEPT' >> $batman_script
+  echo '    iptables -D INPUT -p udp -m state -m udp --dport 5353 --state NEW -j ACCEPT' >> $batman_script
   echo '    iptables -D INPUT -p tcp -m state -m tcp --dport 5354 --state NEW -j ACCEPT' >> $batman_script
-  echo '    iptables -D INPUT -p tcp -m state -m udp --dport 5354 --state NEW -j ACCEPT' >> $batman_script
+  echo '    iptables -D INPUT -p udp -m state -m udp --dport 5354 --state NEW -j ACCEPT' >> $batman_script
   echo '' >> $batman_script
   echo '    if [ -f /bin/systemctl ]; then' >> $batman_script
   echo '        systemctl restart network-manager' >> $batman_script