diff --git a/src/freedombone-app-batman b/src/freedombone-app-batman
index e4c55a21..dccf4564 100755
--- a/src/freedombone-app-batman
+++ b/src/freedombone-app-batman
@@ -105,6 +105,12 @@ function mesh_install_batman {
     if ! grep -q "batman_adv" "$rootdir/etc/modules"; then
         echo 'batman_adv' >> "$rootdir/etc/modules"
     fi
+    if ! grep -q "tunnel6" "$rootdir/etc/modules"; then
+        echo 'tunnel6' >> "$rootdir/etc/modules"
+    fi
+    if ! grep -q "ip6_tunnel" "$rootdir/etc/modules"; then
+        echo 'ip6_tunnel' >> "$rootdir/etc/modules"
+    fi
 
     BATMAN_SCRIPT=$rootdir/var/lib/batman
 
diff --git a/src/freedombone-mesh-install b/src/freedombone-mesh-install
index 2518310d..e49e7b6f 100755
--- a/src/freedombone-mesh-install
+++ b/src/freedombone-mesh-install
@@ -139,8 +139,14 @@ function install_batman {
     $CHROOT_PREFIX apt-get -yq install python-dev libevent-dev ebtables python-pip git
     $CHROOT_PREFIX apt-get -yq install wireless-tools rfkill
 
-    if ! grep -q "batman_adv" $rootdir/etc/modules; then
-        echo 'batman_adv' >> $rootdir/etc/modules
+    if ! grep -q "batman_adv" "$rootdir/etc/modules"; then
+        echo 'batman_adv' >> "$rootdir/etc/modules"
+    fi
+    if ! grep -q "tunnel6" "$rootdir/etc/modules"; then
+        echo 'tunnel6' >> "$rootdir/etc/modules"
+    fi
+    if ! grep -q "ip6_tunnel" "$rootdir/etc/modules"; then
+        echo 'ip6_tunnel' >> "$rootdir/etc/modules"
     fi
 
     BATMAN_SCRIPT=$rootdir/var/lib/batman