diff --git a/src/freedombone-mesh-install b/src/freedombone-mesh-install
index 95b9e51f..d560c458 100755
--- a/src/freedombone-mesh-install
+++ b/src/freedombone-mesh-install
@@ -357,12 +357,16 @@ function mesh_batman {
 	BATMAN_DAEMON=$rootdir/etc/systemd/system/batman.service
 	echo '[Unit]' > $BATMAN_DAEMON
 	echo 'Description=B.A.T.M.A.N. Advanced' >> $BATMAN_DAEMON
+	echo 'After=network.target' >> $BATMAN_DAEMON
 	echo '' >> $BATMAN_DAEMON
 	echo '[Service]' >> $BATMAN_DAEMON
 	echo 'Type=oneshot' >> $BATMAN_DAEMON
+	echo 'RemainAfterExit=yes' >> $BATMAN_DAEMON
 	echo "ExecStart=/var/lib/batman start" >> $BATMAN_DAEMON
 	echo "ExecStop=/var/lib/batman stop" >> $BATMAN_DAEMON
-	echo 'RemainAfterExit=yes' >> $BATMAN_DAEMON
+	echo 'Restart=on-failure' >> $BATMAN_DAEMON
+	echo 'SuccessExitStatus=3 4' >> $BATMAN_DAEMON
+	echo 'RestartForceExitStatus=3 4' >> $BATMAN_DAEMON
 	echo '' >> $BATMAN_DAEMON
 	echo '# Allow time for the server to start/stop' >> $BATMAN_DAEMON
 	echo 'TimeoutSec=300' >> $BATMAN_DAEMON