diff --git a/src/freedombone-client b/src/freedombone-client
index 8645f15b..d8783890 100755
--- a/src/freedombone-client
+++ b/src/freedombone-client
@@ -281,7 +281,7 @@ function remove_known_hosts_entries {
 function setup_avahi_client {
     echo $'Configuring Avahi'
     if [ ! -f /usr/bin/pacman ]; then
-        sudo apt-get -yq install avahi-utils avahi-autoipd avahi-dnsconfd
+        sudo apt-get -yq install avahi-utils avahi-dnsconfd
     else
         sudo pacman -S --noconfirm avahi nss-mdns
         sudo sed -i 's|hosts:.*|hosts: files mdns_minimal [NOTFOUND=return] dns myhostname|g' /etc/nsswitch.conf
diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index a881d4f0..931d1d03 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -1620,7 +1620,7 @@ function image_setup_utils {
     chroot "$rootdir" apt-get -yq install avahi-daemon avahi-utils avahi-discover
     chroot "$rootdir" apt-get -yq install connect-proxy openssh-server
     chroot "$rootdir" apt-get -yq install sudo git dialog build-essential avahi-daemon avahi-utils
-    chroot "$rootdir" apt-get -yq install avahi-discover avahi-autoipd iptables dnsutils net-tools
+    chroot "$rootdir" apt-get -yq install avahi-discover iptables dnsutils net-tools
     chroot "$rootdir" apt-get -yq install network-manager iputils-ping libnss-mdns libnss-myhostname
     chroot "$rootdir" apt-get -yq install libnss-gw-name nano man ntp locales locales-all debconf
     chroot "$rootdir" apt-get -yq install wireless-tools wpasupplicant usbutils cryptsetup zsh
@@ -1925,7 +1925,7 @@ if [[ $VARIANT != "mesh"* ]]; then
     chroot "$rootdir" apt-get install -y openssh-server
 fi
 chroot "$rootdir" apt-get install -y sudo git dialog build-essential
-chroot "$rootdir" apt-get install -y avahi-daemon avahi-utils avahi-discover avahi-autoipd
+chroot "$rootdir" apt-get install -y avahi-daemon avahi-utils avahi-discover
 chroot "$rootdir" apt-get install -y iptables dnsutils net-tools network-manager iputils-ping
 chroot "$rootdir" apt-get install -y libnss-mdns libnss-myhostname libnss-gw-name nano man ntp
 chroot "$rootdir" apt-get install -y locales locales-all debconf wireless-tools wpasupplicant usbutils
diff --git a/src/freedombone-mesh-batman b/src/freedombone-mesh-batman
index 3713f1e2..8f52f1ad 100755
--- a/src/freedombone-mesh-batman
+++ b/src/freedombone-mesh-batman
@@ -74,8 +74,6 @@ function stop {
         brctl delbr $BRIDGE
     fi
 
-    avahi-autoipd -k $BRIDGE
-    avahi-autoipd -k $IFACE
     ifconfig bat0 down -promisc
 
     batctl if del $IFACE
@@ -195,7 +193,6 @@ function start {
     systemctl restart avahi-daemon
 
     add_wifi_interface $IFACE $WIFI_SSID ad-hoc $CHANNEL
-    avahi-autoipd --force-bind --daemonize --wait $IFACE
 
     # NOTE: Don't connect the secondary wifi device. hostapd will handle that by itself
 
diff --git a/src/freedombone-mesh-install b/src/freedombone-mesh-install
index 31c4afc6..d4b452de 100755
--- a/src/freedombone-mesh-install
+++ b/src/freedombone-mesh-install
@@ -92,7 +92,7 @@ function show_help {
 }
 
 function mesh_avahi {
-    $CHROOT_PREFIX apt-get -yq install avahi-utils avahi-autoipd avahi-dnsconfd
+    $CHROOT_PREFIX apt-get -yq install avahi-utils avahi-dnsconfd
 
     decarray=( 1 2 3 4 5 6 7 8 9 0 )
     PEER_ID=${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}
diff --git a/src/freedombone-utils-avahi b/src/freedombone-utils-avahi
index a08a5023..453e4b6d 100755
--- a/src/freedombone-utils-avahi
+++ b/src/freedombone-utils-avahi
@@ -55,7 +55,7 @@ function create_avahi_service {
 }
 
 function mesh_avahi {
-    chroot "$rootdir" apt-get -yq install avahi-utils avahi-autoipd avahi-dnsconfd
+    chroot "$rootdir" apt-get -yq install avahi-utils avahi-dnsconfd
 
     decarray=( 1 2 3 4 5 6 7 8 9 0 )
     PEER_ID=${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}
diff --git a/src/freedombone-utils-setup b/src/freedombone-utils-setup
index 44d0c42d..b8c4dd2c 100755
--- a/src/freedombone-utils-setup
+++ b/src/freedombone-utils-setup
@@ -263,7 +263,7 @@ function initial_setup {
     apt-get -yq install cryptsetup libgfshare-bin duplicity sshpass wget avahi-daemon
     apt-get -yq install avahi-utils avahi-discover connect-proxy openssh-server
     apt-get -yq install sudo git dialog build-essential avahi-daemon avahi-utils
-    apt-get -yq install avahi-discover avahi-autoipd iptables dnsutils net-tools
+    apt-get -yq install avahi-discover iptables dnsutils net-tools
     apt-get -yq install network-manager iputils-ping libnss-mdns libnss-myhostname
     apt-get -yq install libnss-gw-name nano man ntp locales locales-all debconf
     apt-get -yq install wireless-tools wpasupplicant usbutils zsh cpulimit screen