diff --git a/board/common/xattrs b/board/common/xattrs
index b38f8f61..89db8732 100644
--- a/board/common/xattrs
+++ b/board/common/xattrs
@@ -1,3 +1,5 @@
 # Allow users in wheel group to reboot and perform a factory reset
 /sbin/initctl f 4750 root wheel  - - - - -
 /sbin/factory f 4750 root wheel  - - - - -
+
+/var/lib/avahi-autoipd  d 0755 avahi avahi - - - - -
diff --git a/configs/aarch64_defconfig b/configs/aarch64_defconfig
index e9fc267e..264400b0 100644
--- a/configs/aarch64_defconfig
+++ b/configs/aarch64_defconfig
@@ -52,7 +52,6 @@ BR2_PACKAGE_NETOPEER2_CLI=y
 BR2_PACKAGE_NSS_MDNS=y
 BR2_PACKAGE_ONIGURUMA=y
 BR2_PACKAGE_AVAHI=y
-# BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_DEFAULT_SERVICES=y
 BR2_PACKAGE_CHRONY=y
diff --git a/configs/amd64_defconfig b/configs/amd64_defconfig
index 2de8a90f..85caad47 100644
--- a/configs/amd64_defconfig
+++ b/configs/amd64_defconfig
@@ -49,7 +49,6 @@ BR2_PACKAGE_NETOPEER2_CLI=y
 BR2_PACKAGE_NSS_MDNS=y
 BR2_PACKAGE_ONIGURUMA=y
 BR2_PACKAGE_AVAHI=y
-# BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_DEFAULT_SERVICES=y
 BR2_PACKAGE_CHRONY=y
diff --git a/package/skeleton-init-finit/skeleton-init-finit.mk b/package/skeleton-init-finit/skeleton-init-finit.mk
index b7147764..ade9b0b8 100644
--- a/package/skeleton-init-finit/skeleton-init-finit.mk
+++ b/package/skeleton-init-finit/skeleton-init-finit.mk
@@ -44,6 +44,13 @@ endef
 SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_AVAHI
 endif
 
+ifeq ($(BR2_PACKAGE_AVAHI_AUTOIPD),y)
+define SKELETON_INIT_FINIT_SET_AVAHI_AUTOIPD
+	echo "service [2345789] name:zeroconf :%i avahi-autoipd --syslog %i -- ZeroConf for %i" > $(FINIT_D)/available/zeroconf@.conf
+endef
+SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_AVAHI_AUTOIPD
+endif
+
 ifeq ($(BR2_PACKAGE_CHRONY),y)
 define SKELETON_INIT_FINIT_SET_CHRONY
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/chronyd.conf $(FINIT_D)/available/