diff --git a/src/freedombone b/src/freedombone
index fa8c3e11..3041acf1 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -2044,7 +2044,7 @@ function mesh_babel {
   echo '    sed -i "s|host-name=.*|host-name=$(hostname)|g" /etc/avahi/avahi-daemon.conf' >> $babel_script
   echo '    sed -i "s|use-ipv4=.*|use-ipv4=yes|g" /etc/avahi/avahi-daemon.conf' >> $babel_script
   echo '    sed -i "s|use-ipv6=.*|use-ipv6=no|g" /etc/avahi/avahi-daemon.conf' >> $babel_script
-  echo '    sed -i "s|hosts:.*|hosts:          files dns|g" /etc/nsswitch.conf' >> $babel_script
+  echo '    sed -i "s|hosts:.*|hosts:          files mdns4_minimal dns mdns4 mdns|g" /etc/nsswitch.conf' >> $babel_script
   echo '    systemctl restart avahi-daemon' >> $babel_script
   echo 'fi' >> $babel_script
   echo '' >> $babel_script
@@ -2146,7 +2146,7 @@ function mesh_batman_bridge {
   echo '    sed -i "s|use-ipv4=.*|use-ipv4=yes|g" /etc/avahi/avahi-daemon.conf' >> $batman_script
   echo '    sed -i "s|use-ipv6=.*|use-ipv6=no|g" /etc/avahi/avahi-daemon.conf' >> $batman_script
   echo '    sed -i "s|#disallow-other-stacks=.*|disallow-other-stacks=yes|g" /etc/avahi/avahi-daemon.conf' >> $batman_script
-  echo '    sed -i "s|hosts:.*|hosts:          files dns|g" /etc/nsswitch.conf' >> $batman_script
+  echo '    sed -i "s|hosts:.*|hosts:          files mdns4_minimal dns mdns4 mdns|g" /etc/nsswitch.conf' >> $batman_script
   echo 'fi' >> $batman_script
   echo '' >> $batman_script
   echo '# Mesh definition' >> $batman_script
diff --git a/src/freedombone-client b/src/freedombone-client
index 7bffe03b..a8a4844e 100755
--- a/src/freedombone-client
+++ b/src/freedombone-client
@@ -235,7 +235,7 @@ function mesh_batman {
   echo '    sed -i "s|use-ipv4=.*|use-ipv4=yes|g" /etc/avahi/avahi-daemon.conf' >> $batman_script
   echo '    sed -i "s|use-ipv6=.*|use-ipv6=no|g" /etc/avahi/avahi-daemon.conf' >> $batman_script
   echo '    sed -i "s|#disallow-other-stacks=.*|disallow-other-stacks=yes|g" /etc/avahi/avahi-daemon.conf' >> $batman_script
-  echo '    sed -i "s|hosts:.*|hosts:          files dns|g" /etc/nsswitch.conf' >> $batman_script
+  echo '    sed -i "s|hosts:.*|hosts:          files mdns4_minimal dns mdns4 mdns|g" /etc/nsswitch.conf' >> $batman_script
   echo '    if [ -f /bin/systemctl ]; then' >> $batman_script
   echo '        systemctl restart avahi-daemon' >> $batman_script
   echo '    else' >> $batman_script