diff --git a/bsp/ath79-generic/.config b/bsp/ath79-generic/.config
index 67c0f578..ba686528 100644
--- a/bsp/ath79-generic/.config
+++ b/bsp/ath79-generic/.config
@@ -80,11 +80,10 @@ CONFIG_CLEAN_IPKG=y
 # CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC is not set
 CONFIG_KERNEL_SQUASHFS_FRAGMENT_CACHE_SIZE=1
 # CONFIG_PACKAGE_ALFRED_VIS is not set
-CONFIG_PACKAGE_hostapd-mini=y
 CONFIG_PACKAGE_iwinfo=m
 CONFIG_PACKAGE_libiwinfo=m
 CONFIG_PACKAGE_opkg=m
-CONFIG_PACKAGE_wpad-mini=m
+CONFIG_PACKAGE_wpad-basic-wolfssl=m
 CONFIG_PACKAGE_ath10k-firmware-qca9887=m
 CONFIG_PACKAGE_ath10k-firmware-qca9888=m
 CONFIG_PACKAGE_ath10k-firmware-qca988x=m
diff --git a/bsp/ipq40xx-generic/.config b/bsp/ipq40xx-generic/.config
index 4f1ee1fa..f1e4df5e 100644
--- a/bsp/ipq40xx-generic/.config
+++ b/bsp/ipq40xx-generic/.config
@@ -21,5 +21,6 @@ CONFIG_PACKAGE_ath10k-firmware-qca4019-ct=m
 CONFIG_PACKAGE_kmod-ath10k=m
 CONFIG_PACKAGE_kmod-ath10k-ct=m
 CONFIG_PACKAGE_opkg=m
+CONFIG_PACKAGE_wpad-basic-wolfssl=m
 CONFIG_STRIP_KERNEL_EXPORTS=y
 CONFIG_PACKAGE_kmod-hwmon-core=y
diff --git a/bsp/ipq806x-generic/.config b/bsp/ipq806x-generic/.config
index d4997bfe..4315ef16 100644
--- a/bsp/ipq806x-generic/.config
+++ b/bsp/ipq806x-generic/.config
@@ -24,6 +24,7 @@ CONFIG_CLEAN_IPKG=y
 # CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC is not set
 # CONFIG_PACKAGE_ALFRED_VIS is not set
 CONFIG_PACKAGE_opkg=m
+CONFIG_PACKAGE_wpad-basic-wolfssl=m
 CONFIG_PACKAGE_ath10k-firmware-qca99x0=m
 CONFIG_PACKAGE_kmod-ath10k=y
 CONFIG_PACKAGE_ath10k-firmware-qca99x0-ct=m
diff --git a/bsp/mpc85xx-p1010/.config b/bsp/mpc85xx-p1010/.config
index 4ce729b6..a4889c8a 100644
--- a/bsp/mpc85xx-p1010/.config
+++ b/bsp/mpc85xx-p1010/.config
@@ -24,5 +24,6 @@ CONFIG_CLEAN_IPKG=y
 # CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC is not set
 # CONFIG_PACKAGE_ALFRED_VIS is not set
 CONFIG_PACKAGE_opkg=m
+CONFIG_PACKAGE_wpad-basic-wolfssl=m
 CONFIG_STRIP_KERNEL_EXPORTS=y
 CONFIG_TARGET_SQUASHFS_BLOCK_SIZE=512
diff --git a/bsp/ramips-mt7621/.config b/bsp/ramips-mt7621/.config
index bc7766a9..f748c400 100644
--- a/bsp/ramips-mt7621/.config
+++ b/bsp/ramips-mt7621/.config
@@ -30,5 +30,6 @@ CONFIG_CLEAN_IPKG=y
 # CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC is not set
 # CONFIG_PACKAGE_ALFRED_VIS is not set
 CONFIG_PACKAGE_opkg=m
+CONFIG_PACKAGE_wpad-basic-wolfssl=m
 CONFIG_STRIP_KERNEL_EXPORTS=y
 CONFIG_TARGET_SQUASHFS_BLOCK_SIZE=512
diff --git a/bsp/ramips-mt76x8/.config b/bsp/ramips-mt76x8/.config
index 59ec0a4e..0f42b217 100644
--- a/bsp/ramips-mt76x8/.config
+++ b/bsp/ramips-mt76x8/.config
@@ -30,4 +30,5 @@ CONFIG_CLEAN_IPKG=y
 # CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC is not set
 # CONFIG_PACKAGE_ALFRED_VIS is not set
 CONFIG_PACKAGE_opkg=m
+CONFIG_PACKAGE_wpad-basic-wolfssl=m
 CONFIG_STRIP_KERNEL_EXPORTS=y
diff --git a/src/packages/fff/fff-layer3/Makefile b/src/packages/fff/fff-layer3/Makefile
index 16abaf41..163ea73e 100644
--- a/src/packages/fff/fff-layer3/Makefile
+++ b/src/packages/fff/fff-layer3/Makefile
@@ -38,11 +38,13 @@ define Package/fff-layer3
 	         +iptables-mod-filter \
 	         +iptables-mod-ipopt \
 	         +iptables-mod-conntrack-extra \
+	         +mesh11sd \
 	         +mtr \
 	         +snmp-utils \
 	         +tc \
 	         +tcpdump \
-	         +vxlan
+	         +vxlan \
+	         +wpad-wolfssl
 endef
 
 define Package/fff-layer3/description
diff --git a/src/packages/fff/fff-node/Makefile b/src/packages/fff/fff-node/Makefile
index a22bd946..1f7fc3f2 100644
--- a/src/packages/fff/fff-node/Makefile
+++ b/src/packages/fff/fff-node/Makefile
@@ -10,7 +10,8 @@ define Package/fff-node
 	CATEGORY:=Freifunk
 	TITLE:=Freifunk-Franken node configuration
 	URL:=https://www.freifunk-franken.de
-	DEPENDS:=+fff-batman-adv \
+	DEPENDS:=+hostapd-mini \
+	         +fff-batman-adv \
 	         +fff-fastd \
 	         +fff-vxlan-node-vpn \
 	         +fff-firewall \