diff --git a/net/wifibox-alpine/Makefile b/net/wifibox-alpine/Makefile
index f7a6a62d7360..41cdfe960d26 100644
--- a/net/wifibox-alpine/Makefile
+++ b/net/wifibox-alpine/Makefile
@@ -1,496 +1,506 @@
 PORTNAME=	wifibox-alpine
-PORTVERSION=	20240328
+PORTVERSION=	20240506
 CATEGORIES=	net
 
 MAINTAINER=	pali.gabor@gmail.com
 COMMENT=	Wifibox guest based on Alpine Linux
 WWW=		https://github.com/pgj/freebsd-wifibox-alpine
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC_scripts}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64
 EXTRACT_ONLY=	${_DISTFILES:M*_GH0.tar.gz}
 
 BUILD_DEPENDS=	gtar>0:archivers/gtar \
 		patchelf>0:sysutils/patchelf \
 		squashfs-tools-ng>0:sysutils/squashfs-tools-ng
 
 .include "${.CURDIR}/flavors.mk"
 
 .for flavor in ${_FLAVORS}
 ${flavor}_PKGNAMESUFFIX=	-${flavor}
 .endfor
 
 OPTIONS_DEFINE=			UDS_PASSTHRU IPV6
 OPTIONS_SUB=			yes
 
 OPTIONS_SINGLE=			COMPRESSION APPLICATION KERNEL
 OPTIONS_SINGLE_COMPRESSION=	COMP_GZIP COMP_LZ4 COMP_LZO COMP_XZ COMP_ZSTD
 OPTIONS_SINGLE_APPLICATION=	APP_HOSTAPD APP_WPA_SUPPLICANT
 OPTIONS_SINGLE_KERNEL=		KERN_LTS KERN_EDGE
 
 OPTIONS_GROUP=			EXTRAS
 OPTIONS_GROUP_EXTRAS=		XX_MDNS XX_FORWARDING XX_TCPDUMP
 
 OPTIONS_DEFAULT=		COMP_XZ APP_WPA_SUPPLICANT UDS_PASSTHRU KERN_LTS IPV6
 
 COMP_GZIP_DESC=		gzip
 COMP_LZ4_DESC=		lz4
 COMP_LZO_DESC=		lzo
 COMP_XZ_DESC=		xz
 COMP_ZSTD_DESC=		zstd
 
 UDS_PASSTHRU_DESC=		Control socket pass-through (wpa_supplicant/hostapd)
 IPV6_DESC=			IPv6 support
 APP_HOSTAPD_DESC=		Access Point (hostapd)
 APP_WPA_SUPPLICANT_DESC=	WPA Supplicant (wpa_supplicant)
 XX_MDNS_DESC=			mDNS Responder Daemon
 XX_FORWARDING_DESC=		User-space forwarding
 XX_TCPDUMP_DESC=		Packet analysis with tcpdump
 
 KERN_LTS_DESC=			Linux LTS (6.6.x)
 KERN_EDGE_DESC=			Linux edge (6.8.x)
 
 UDS_PASSTHRU_RUN_DEPENDS=	socat>0:net/socat
 
 .if ${FLAVOR:U} == default
 OPTIONS_GROUP+=		FIRMWARE
 OPTIONS_GROUP_FIRMWARE=	FW_ATH10K FW_ATH11K FW_ATH12K FW_ATMEL FW_B43 FW_B43LEGACY\
 			FW_BRCM FW_IPW2100 FW_IPW2200 FW_IWL3945 FW_IWL4965 FW_IWLWIFI\
 			FW_MEDIATEK FW_MARVELL FW_RT61 FW_RTLWIFI FW_RTW88 FW_RTW89\
 			FW_TI
 OPTIONS_GROUP_EXTRAS+=	XX_DRIVER_WL
 
 OPTIONS_DEFAULT+=	FW_ATH10K FW_ATH11K FW_ATH12K FW_BRCM FW_IWLWIFI FW_MEDIATEK\
 			FW_MARVELL FW_RT61 FW_RTLWIFI FW_RTW88 FW_RTW89
 
 FW_ATH10K_DESC=		Qualcomm Atheros 802.11ac
 FW_ATH11K_DESC=		Qualcomm Atheros 802.11ax
 FW_ATH12K_DESC=		Qualcomm Atheros 802.11be
 FW_ATMEL_DESC=		Atmel at76c50x 802.11b
 FW_B43_DESC=		Broadcom B43xx 802.11a/b/g/n
 FW_B43LEGACY_DESC=	Broadcom B43xx 802.11b (legacy)
 FW_BRCM_DESC=		Broadcom 802.11n
 FW_IWL3945_DESC=	Intel(R) PRO/Wireless 3945ABG 802.11a/b/g
 FW_IWL4965_DESC=	Intel(R) Wireless WiFi 4965AGN 802.11a/b/g/n
 FW_IWLWIFI_DESC=	Intel(R) Wireless WiFi 802.11a/b/g/n
 FW_IPW2100_DESC=	Intel(R) PRO/Wireless 2100 802.11a/b
 FW_IPW2200_DESC=	Intel(R) PRO/Wireless 2200 802.11b/g/n
 FW_MEDIATEK_DESC=	MediaTek MT76xxx 802.11n, MT79xx 802.11ax
 FW_MARVELL_DESC=	Marvell 88W8xxx (TopDog) 802.11b/g/n
 FW_RT61_DESC=		Ralink RT2xxx (RT61) 802.11a/b/g
 FW_RTLWIFI_DESC=	Realtek 802.11n
 FW_RTW88_DESC=		Realtek 802.11ac
 FW_RTW89_DESC=		Realtek 802.11ax
 FW_TI_DESC=		Texas Instruments WL1xxx 802.11b/g/n
 
 XX_DRIVER_WL_DESC=	Broadcom 802.11 STA driver (+ firmware, exclusive)
 .endif
 
 _GITHUB_SITE=	https://github.com/pgj/freebsd-wifibox-alpine/releases/download
 
 USE_GITHUB=	nodefault
 GH_ACCOUNT=	pgj
 GH_PROJECT=	freebsd-wifibox-alpine:scripts
-GH_TAGNAME=	fe9b384e45c57b0cfafe5e5b3931ba163f4230fd:scripts
+GH_TAGNAME=	3ce5b1faf48ef4b9d52c38bf518aa612242fba3f:scripts
 
 ALPINE_VERSION=	3.19.1
 ALPINE_DATE=	2024.03.23
 
 LINUX_LTS_VERSION=	6.6.22-r1
 LINUX_EDGE_VERSION=	6.8.1-r1
 
 _ALPINE_VER=	${ALPINE_VERSION:C@([0-9]+)\.([0-9]+).*@\1.\2@}
 _ALPINE_SITE1=	https://dl-cdn.alpinelinux.org/alpine/v${_ALPINE_VER}
 
 _ALPINE_BASE=	https://mirror.fel.cvut.cz
 
 .if defined(ALPINE_DATE)
 _SNAPSHOT=     	${ALPINE_DATE:S/./-/g}
 _ALPINE_SITE2=  ${_ALPINE_BASE}/alpine/snapshots/${_SNAPSHOT}/v${_ALPINE_VER}
 .else
 _ALPINE_SITE2=	${_ALPINE_BASE}/alpine/v${_ALPINE_VER}
 .endif
 
 _LINUXFW_SITE=	https://git.kernel.org/pub/scm/linux/kernel/git/firmware/
 _LINUXFW_TAG=	20240312
 _LINUXFW=	linux-firmware-${_LINUXFW_TAG}
 
 MASTER_SITES+=	${_ALPINE_SITE1}/releases/x86_64/:rootfs \
 		${_ALPINE_SITE2}/main/x86_64/:main_packages \
 		${_ALPINE_SITE2}/community/x86_64/:community_packages \
 		${_GITHUB_SITE}/packages/:custom_packages \
 		${_LINUXFW_SITE}/linux-firmware.git/snapshot/:linux_firmware \
 		https://sources.openwrt.org/:openwrt \
 		https://lwfinger.com/b43-firmware/:b43 \
 		https://thekelleys.org.uk/atmel/:atmel \
 		https://github.com/openwrt/mt76/archive/:mt76
 
 _MINIROOTFS=	alpine-minirootfs-${ALPINE_VERSION}-x86_64.tar.gz
 _PACKAGES=	baselayout-3.4.3-r3:wifibox \
 		busybox-1.36.1-r2:wifibox \
 		ifupdown-ng-0.12.1-r2:wifibox \
 		iptables-1.8.10-r0:wifibox \
 		iw-5.19-r1 \
 		libcap2-2.69-r1 \
 		libcap-getcap-2.69-r1 \
 		libcap-setcap-2.69-r1 \
 		libcap-utils-2.69-r1 \
 		libcrypto3-3.1.4-r5 \
 		libmnl-1.0.5-r2 \
 		libnftnl-1.2.6-r0 \
 		libnl3-3.9.0-r1 \
 		libssl3-3.1.4-r5 \
 		musl-1.2.4_git20230717-r4 \
 		openrc-0.52.1-r0:wifibox
 
 _BOOT_SERVICES=		bootmisc defaults modules hostname hwclock networking sysctl \
 			syslog urandom
 _DEFAULT_SERVICES=	acpid crond iptables udhcpd
 _SYSINIT_SERVICES=	devfs dmesg hwdrivers mdev
 
 _ATMEL_FIRMWARE=	atmel-firmware-1.3
 _B43LEGACY_FIRMWARE=	wl_apsta-3.130.20.0
 _B43_FIRMWARE=		broadcom-wl-6.30.163.46
 _IPW2100_FIRMWARE=	ipw/ipw2100-1.3 \
 			ipw/ipw2100-1.3-i
 _IPW2200_FIRMWARE=	iwi/ipw2200-bss \
 			iwi/ipw2200-ibss
 _MT76_FIRMWARE=		2135e201e7a9339e018d4e2d4a33c73266e674d7
 
 _LINUX64_KMOD!=		(kldstat -qn linux64 && echo "found") || echo ""
+_LINUX_EMUL_PATH!=	(sysctl -qn compat.linux.emul_path) || echo ""
+_LINUX_EP_EXISTS!=	(test -d "${_LINUX_EMUL_PATH}" && echo "found") || echo ""
 
-.if empty(_LINUX64_KMOD)
+.if empty(IGNORE) && empty(_LINUX64_KMOD)
 IGNORE=	needs the linux64 kernel module to build
 .endif
 
+.if empty(IGNORE) && empty(_LINUX_EMUL_PATH)
+IGNORE=	needs compat.linux.emul_path to be set
+.endif
+
+.if empty(IGNORE) && empty(_LINUX_EP_EXISTS)
+IGNORE= needs compat.linux.emul_path to point to an existing directory
+.endif
+
 pre-everything::
 .if !defined(FIRMWARE_FILES)
 	@${ECHO_MSG} "===> NOTICE:"
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Use the FIRMWARE_FILES make(1) variable to keep only the firmware files that"
 	@${ECHO_MSG} "are used by the driver to reduce the size of the disk image."
 	@${ECHO_MSG}
 	@sleep 1
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MUDS_PASSTHRU}
 _BOOT_SERVICES+=	uds_passthru
 .endif
 
 .if ${PORT_OPTIONS:MIPV6}
 _BOOT_SERVICES+=	ip6tables radvd
 .endif
 
 .if (${PORT_OPTIONS:MUDS_PASSTHRU} && empty(PORT_OPTIONS:MXX_FORWARDING)) \
 	|| make(makesum) || make(fetch-url-list-int)
 _PACKAGES+=		socat-1.8.0.0-r0:wifibox
 .endif
 
 .if ${PORT_OPTIONS:MXX_FORWARDING} || make(makesum) || make(fetch-url-list-int)
 _PACKAGES+=		socat-with-udp-1.8.0.0-r0:wifibox
 .endif
 
 .if ${PORT_OPTIONS:MUDS_PASSTHRU} || make(makesum) || make(fetch-url-list-int)
 _PACKAGES+=		uds_passthru-0.1.1-r3:wifibox
 .endif
 
 .if ${PORT_OPTIONS:MIPV6} || make(makesum) || make(fetch-url-list-int)
 _PACKAGES+=		radvd-2.19-r1:wifibox
 .endif
 
 .if ${PORT_OPTIONS:MIPV6} && ${PORT_OPTIONS:MAPP_WPA_SUPPLICANT} \
 	|| make(makesum) || make(fetch-url-list-int)
 _PACKAGES+=		dhcpcd-10.0.6-r0:wifibox
 .endif
 
 .if ${PORT_OPTIONS:MAPP_WPA_SUPPLICANT}
 _VIRTFS_MOUNTS=		app_config:/etc/wpa_supplicant
 _BOOT_SERVICES+=	wpa_supplicant
 _ETC_SRCS=		etc/wpa_supplicant
 .if ${PORT_OPTIONS:MIPV6}
 _ETC_SRCS+=		etc/optional/ipv6/wpa_supplicant
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MAPP_WPA_SUPPLICANT} || make(makesum) || make(fetch-url-list-int)
 _PACKAGES+=		pcsc-lite-libs-2.0.0-r2 \
 			wpa_supplicant-2.10-r7:wifibox
 .endif
 
 .if ${PORT_OPTIONS:MAPP_HOSTAPD}
 _VIRTFS_MOUNTS=		app_config:/etc/hostapd
 _BOOT_SERVICES+=	hostapd
 _ETC_SRCS=		etc/hostapd
 .if ${PORT_OPTIONS:MIPV6}
 _ETC_SRCS+=		etc/optional/ipv6/hostapd
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MAPP_HOSTAPD} || make(makesum) || make(fetch-url-list-int)
 _PACKAGES+=		hostapd-2.10-r4:wifibox
 .endif
 
 .if ${PORT_OPTIONS:MXX_MDNS}
 _DEFAULT_SERVICES+=	mdnsresponderposix
 _ETC_SRCS+=		etc/optional/mdns
 .endif
 
 .if ${PORT_OPTIONS:MXX_MDNS} || make(makesum) || make(fetch-url-list-int)
 _PACKAGES+=		mbedtls-2.28.7-r0 \
 			mDNSResponder-2200.80.16-r0:wifibox
 .endif
 
 .if ${PORT_OPTIONS:MXX_FORWARDING}
 _BOOT_SERVICES+=	forwarding
 _ETC_SRCS+=		etc/optional/forwarding
 .endif
 
 .if ${PORT_OPTIONS:MXX_FORWARDING} || make(makesum) || make(fetch-url-list-int)
 _PACKAGES+=		forwarding-0.1.0-r3:wifibox
 .endif
 
 .if ${PORT_OPTIONS:MXX_TCPDUMP} || make(makesum) || make(fetch-url-list-int)
 _PACKAGES+=		libpcap-1.10.4-r1 \
 			tcpdump-4.99.4-r1
 .endif
 
 .if ${PORT_OPTIONS:MKERN_LTS} || make(makesum) || make(fetch-url-list-int)
 _PACKAGES+=		linux-lts-${LINUX_LTS_VERSION}:wifibox
 .endif
 
 .if ${PORT_OPTIONS:MKERN_EDGE} || make(makesum) || make(fetch-url-list-int)
 _PACKAGES+=		linux-edge-${LINUX_EDGE_VERSION}:wifibox
 .endif
 
 .if ${PORT_OPTIONS:MXX_MDNS} || ${PORT_OPTIONS:MXX_FORWARDING}
 PKGMESSAGE=		pkg-message.iptables
 .endif
 
 .for flavor in ${_FLAVORS}
 .if ${FLAVOR:U} == ${flavor}
 PORT_OPTIONS+=		FW_${flavor:tu}
 .endif
 .endfor
 
 DIST_SUBDIR=	wifibox-alpine
 DISTFILES+=	${_MINIROOTFS}:rootfs
 
 LFW_ATH10K_FILES=	ath10k
 LFW_ATH11K_FILES=	ath11k
 LFW_ATH12K_FILES=	ath12k
 LFW_BRCM_FILES=		brcm
 LFW_IWL3945_FILES=	iwlwifi-3945-*.ucode
 LFW_IWL4965_FILES=	iwlwifi-4965-*.ucode
 LFW_IWLWIFI_FILES=	iwlwifi-*
 LFW_MEDIATEK_FILES=	mediatek
 LFW_MARVELL_FILES=	mwl*
 LFW_RT61_FILES=		rt*.bin
 LFW_RTLWIFI_FILES=	rtlwifi
 LFW_RTW88_FILES=	rtw88
 LFW_RTW89_FILES=	rtw89
 LFW_TI_FILES=		ti-connectivity
 
 .for fw_opt in ${PORT_OPTIONS:MFW_*}
 .if defined(L${fw_opt}_FILES)
 LINUX_FIRMWARE+=	${L${fw_opt}_FILES}
 .endif
 .endfor
 
 RTL8821CE_VERSION=	20240120
 RTW88_VERSION=		20240316
-RTW89_VERSION=		20240310
+RTW89_VERSION=		20240106
 BROADCOM_WL_VERSION=	6.30.223.271
 
 _LINUX_LTS_MAJOR=	${LINUX_LTS_VERSION:C/^([0-9]*)\..*/\1/}
 _LINUX_LTS_MINOR=	${LINUX_LTS_VERSION:C/^[0-9]*\.([0-9]*)\..*/\1/}
 _LINUX_LTS_PATCH=	${LINUX_LTS_VERSION:C/^[0-9]*\.[0-9]*\.([0-9]*)-.*/\1/}
 _LINUX_LTS_REVISION=	${LINUX_LTS_VERSION:C/^.*-r([0-9]*)/\1/}
 
 _KERN_LTS_REL!=		printf "%02d%02d%03d%02d" \
 			${_LINUX_LTS_MAJOR} \
 			${_LINUX_LTS_MINOR} \
 			${_LINUX_LTS_PATCH} \
 			${_LINUX_LTS_REVISION}
 
 _LINUX_EDGE_MAJOR=	${LINUX_EDGE_VERSION:C/^([0-9]*)\..*/\1/}
 _LINUX_EDGE_MINOR=	${LINUX_EDGE_VERSION:C/^[0-9]*\.([0-9]*)\..*/\1/}
 _LINUX_EDGE_PATCH=	${LINUX_EDGE_VERSION:C/^[0-9]*\.[0-9]*\.([0-9]*)-.*/\1/}
 _LINUX_EDGE_REVISION=	${LINUX_EDGE_VERSION:C/^.*-r([0-9]*)/\1/}
 
 _KERN_EDGE_REL!=	printf "%02d%02d%03d%02d" \
 			${_LINUX_EDGE_MAJOR} \
 			${_LINUX_EDGE_MINOR} \
 			${_LINUX_EDGE_PATCH} \
 			${_LINUX_EDGE_REVISION}
 
 .if ${PORT_OPTIONS:MFW_RTW88} && ${PORT_OPTIONS:MKERN_LTS} \
 	|| make(makesum) || make(fetch-url-list-int)
 _PACKAGES+=	rtl8821ce-${RTL8821CE_VERSION}-r${_KERN_LTS_REL}00:wifibox \
 		rtw88-${RTW88_VERSION}-r${_KERN_LTS_REL}00:wifibox
 .endif
 
 .if ${PORT_OPTIONS:MFW_RTW88} && ${PORT_OPTIONS:MKERN_EDGE} \
 	|| make(makesum) || make(fetch-url-list-int)
 _PACKAGES+=	rtl8821ce-edge-${RTL8821CE_VERSION}-r${_KERN_EDGE_REL}00:wifibox \
 		rtw88-edge-${RTW88_VERSION}-r${_KERN_EDGE_REL}00:wifibox
 .endif
 
 .if ${PORT_OPTIONS:MFW_RTW89} && ${PORT_OPTIONS:MKERN_LTS} \
 	|| make(makesum) || make(fetch-url-list-int)
 _PACKAGES+=	rtw89-${RTW89_VERSION}-r${_KERN_LTS_REL}00:wifibox
 .endif
 
 .if ${PORT_OPTIONS:MFW_RTW89} && ${PORT_OPTIONS:MKERN_EDGE} \
 	|| make(makesum) || make(fetch-url-list-int)
 _PACKAGES+=	rtw89-edge-${RTW89_VERSION}-r${_KERN_EDGE_REL}00:wifibox
 .endif
 
 .if ${PORT_OPTIONS:MXX_DRIVER_WL} && ${PORT_OPTIONS:MKERN_LTS} \
 	|| make(makesum) || make(fetch-url-list-int)
 _PACKAGES+=	broadcom-wl-${BROADCOM_WL_VERSION}-r${_KERN_LTS_REL}00:wifibox
 .endif
 
 .if ${PORT_OPTIONS:MXX_DRIVER_WL} && ${PORT_OPTIONS:MKERN_EDGE} \
 	|| make(makesum) || make(fetch-url-list-int)
 _PACKAGES+=	broadcom-wl-edge-${BROADCOM_WL_VERSION}-r${_KERN_EDGE_REL}00:wifibox
 .endif
 
 .if !empty(LINUX_FIRMWARE)
 _LINUXFWFILE=	${_LINUXFW}.tar.gz
 _LINUXFWDIR=	${WRKDIR}/${_LINUXFW}
 .endif
 
 .if !empty(LINUX_FIRMWARE) || make(makesum)
 DISTFILES+=	${_LINUXFWFILE}:linux_firmware
 .endif
 
 .for package in ${_PACKAGES}
 .if ${package:M*\:wifibox}
 DISTFILES+=	${package:C@^([^:]*):wifibox$@\1@}.apk:custom_packages
 .elif ${package:M*\:community}
 DISTFILES+=	${package:C@^([^:]*):community$@\1@}.apk:community_packages
 .else
 DISTFILES+=	${package:C@^([^:]*):wifibox$@\1@}.apk:main_packages
 .endif
 _APK_FILES+=	${_DISTDIR}/${package:C@^([^:]*):.*$@\1@}.apk
 .endfor
 
 _GUESTDIR=	${WRKSRC}/guest
 _ETCDIR=	${_GUESTDIR}/etc
 _FIRMWAREDIR=	${_GUESTDIR}/lib/firmware
 
 .if ${PORT_OPTIONS:MFW_ATMEL} || make(makesum)
 DISTFILES+=	${_ATMEL_FIRMWARE}.tar.gz:atmel
 .endif
 
 .if ${PORT_OPTIONS:MFW_B43LEGACY} || make(makesum)
 DISTFILES+=	${_B43LEGACY_FIRMWARE}.o:openwrt
 .endif
 
 .if ${PORT_OPTIONS:MFW_B43}
 EXTRACT_ONLY+=	${_B43_FIRMWARE}.tar.bz2
 .endif
 
 .if ${PORT_OPTIONS:MFW_B43} || make(makesum)
 DISTFILES+=	${_B43_FIRMWARE}.tar.bz2:b43
 .endif
 
 .if ${PORT_OPTIONS:MFW_B43*}
 BUILD_DEPENDS+=		b43-fwcutter>0:sysutils/b43-fwcutter
 FW_B43_TARGETDIR=	${_FIRMWAREDIR}/b43
 FW_B43_FIRMWARE=	${WRKDIR}/${_B43_FIRMWARE}.wl_apsta.o
 FW_B43LEGACY_TARGETDIR=	${_FIRMWAREDIR}/b43legacy
 FW_B43LEGACY_FIRMWARE=	${_DISTDIR}/${_B43LEGACY_FIRMWARE}.o
 .endif
 
 .if ${PORT_OPTIONS:MFW_IPW2*} && !exists(${SRC_BASE}/sys/Makefile)
 IGNORE= requires kernel source files in SRC_BASE=${SRC_BASE}
 .endif
 
 .if ${PORT_OPTIONS:MFW_MEDIATEK} || make(makesum)
 DISTFILES+=	${_MT76_FIRMWARE}.zip:mt76
 .endif
 
 pre-build:
 .if ${PORT_OPTIONS:MAPP_WPA_SUPPLICANT}
 	${MKDIR} ${_ETCDIR}/wpa_supplicant
 .endif
 .if ${PORT_OPTIONS:MAPP_HOSTAPD}
 	${MKDIR} ${_ETCDIR}/hostapd
 .endif
 	${MKDIR} ${_FIRMWAREDIR}
 .for fw in ${PORT_OPTIONS:MFW_B43*}
 .if ${fw}
 	(_TARGETDIR=${${fw}_TARGETDIR}; \
 	${MKDIR} $$_TARGETDIR; \
 	${LOCALBASE}/bin/b43-fwcutter -w $$_TARGETDIR ${${fw}_FIRMWARE}; \
 	${FIND} $$_TARGETDIR -mindepth 2 -type f -exec ${MV} {} $$_TARGETDIR \; ; \
 	${FIND} $$_TARGETDIR -type d -delete)
 .endif
 .endfor
 .if ${PORT_OPTIONS:MFW_ATMEL}
 	${TAR} -xf ${_DISTDIR}/${_ATMEL_FIRMWARE}.tar.gz \
 		-C ${_FIRMWAREDIR} --strip-components 2 \
 		*/images/atmel_*.bin
 .endif
 .for fw in ${PORT_OPTIONS:MFW_IPW2*}
 .for fw_file in ${${fw:C@FW@@}_FIRMWARE}
 	uudecode -p ${SRC_BASE}/sys/contrib/dev/${fw_file}.fw.uu \
 		> ${_FIRMWAREDIR}/${fw_file:C@^[^/]*/(.*)@\1@}.fw
 .endfor
 .endfor
 .for fw_files in ${LINUX_FIRMWARE}
 	${TAR} -xf ${_DISTDIR}/${_LINUXFWFILE} \
 		-C ${_FIRMWAREDIR} --strip-components 1 \
 		*/${fw_files}
 .endfor
 .if ${PORT_OPTIONS:MFW_BRCM}
 	$(FIND) ${_FIRMWAREDIR}/${LFW_BRCM_FILES} -name 'brcmfmac*-pcie.bin' -type f \
 		| ${SED} -E 's!(.*)-pcie.bin!ln -s $$(basename \1-pcie.bin) \1-pcie.bin.FreeBSD-BHYVE.bin!' \
 		| ${SH}
 .endif
 .if ${PORT_OPTIONS:MFW_MEDIATEK}
 	${TAR} -xf ${_DISTDIR}/${_MT76_FIRMWARE}.zip \
 		-C ${_FIRMWAREDIR} --strip-components 2 \
 		*/firmware/mt76??_e?.bin
 .endif
 
 post-install:
 .if empty(PORT_OPTIONS:MUDS_PASSTHRU)
 	${RM} ${STAGEDIR}${PREFIX}/etc/wifibox/appliance/uds_passthru.conf.sample
 .endif
 .if ${PORT_OPTIONS:MAPP_HOSTAPD} && ${PORT_OPTIONS:MUDS_PASSTHRU}
 	${MKDIR} ${STAGEDIR}/var/run/hostapd
 .endif
 
 WRKSRC=		${WRKSRC_scripts}
 MAKE_ARGS+=	VERSION=${PORTVERSION} \
 		MINIROOTFS=${_DISTDIR}/${_MINIROOTFS} \
 		PACKAGES="${_APK_FILES}" \
 		BOOT_SERVICES="${_BOOT_SERVICES}" \
 		DEFAULT_SERVICES="${_DEFAULT_SERVICES}" \
 		SYSINIT_SERVICES="${_SYSINIT_SERVICES}" \
 		ETC_SRCS="${_ETC_SRCS}" \
 		EXTRA_VIRTFS_MOUNTS="${_VIRTFS_MOUNTS}" \
 		SQUASHFS_COMP=${PORT_OPTIONS:MCOMP_*:S/COMP_//:tl}
 
 .if defined(FIRMWARE_FILES)
 MAKE_ARGS+=	FIRMWARE_FILES=${FIRMWARE_FILES}
 .endif
 
 .if make(check-alpine-packages)
 _APK_FETCH!=	${MAKE} fetch-urlall-list | ${GREP} apk | ${GREP} -v distcache
 .endif
 
 check-alpine-packages:
 .for apk in ${_APK_FETCH}
 	@${ECHO} -n "${apk:C@^.*/([0-9A-za-z\._-]*)@\1@} (${apk})..."
 	@${FETCH_CMD} -s ${apk} > /dev/null
 	@${ECHO} "OK"
 .endfor
 
 .include <bsd.port.mk>
diff --git a/net/wifibox-alpine/distinfo b/net/wifibox-alpine/distinfo
index 37ee6599bdf1..a9bcd657630a 100644
--- a/net/wifibox-alpine/distinfo
+++ b/net/wifibox-alpine/distinfo
@@ -1,93 +1,93 @@
-TIMESTAMP = 1711611047
+TIMESTAMP = 1714987776
 SHA256 (wifibox-alpine/alpine-minirootfs-3.19.1-x86_64.tar.gz) = 185123ceb6e7d08f2449fff5543db206ffb79decd814608d399ad447e08fa29e
 SIZE (wifibox-alpine/alpine-minirootfs-3.19.1-x86_64.tar.gz) = 3285677
 SHA256 (wifibox-alpine/linux-firmware-20240312.tar.gz) = 89cbac35d1bd21ebf64936d764ccd01d4e0b6cde973e3b940f8ad2bac9086ec8
 SIZE (wifibox-alpine/linux-firmware-20240312.tar.gz) = 563675974
 SHA256 (wifibox-alpine/baselayout-3.4.3-r3.apk) = ca9162f49d0e9d839d17839463be18be9d1133a7da77ee0f8f38cb206139ec25
 SIZE (wifibox-alpine/baselayout-3.4.3-r3.apk) = 14073
 SHA256 (wifibox-alpine/busybox-1.36.1-r2.apk) = 66ff5ff8258dc39494d8426a854aaa7bc060c6613a69c49e9aac6eb5e9ccdb30
 SIZE (wifibox-alpine/busybox-1.36.1-r2.apk) = 338474
 SHA256 (wifibox-alpine/ifupdown-ng-0.12.1-r2.apk) = 54b90bfa22c85750c7cd4be6845f70b0a6e06f477ab4dbdbb27cba268a27769a
 SIZE (wifibox-alpine/ifupdown-ng-0.12.1-r2.apk) = 29668
 SHA256 (wifibox-alpine/iptables-1.8.10-r0.apk) = 442651c837dda8d5058ea93f7347cfdfd495a42b03fa712c4b6c2db5801d7119
 SIZE (wifibox-alpine/iptables-1.8.10-r0.apk) = 406364
 SHA256 (wifibox-alpine/iw-5.19-r1.apk) = 81be6fc3a65f5e97ebc613230223a79974633f19fa09107fe0499104d6939602
 SIZE (wifibox-alpine/iw-5.19-r1.apk) = 95442
 SHA256 (wifibox-alpine/libcap2-2.69-r1.apk) = e5733777fee2b85644e4ca6362da3eb8206559311bbf267a4a0633e6169af535
 SIZE (wifibox-alpine/libcap2-2.69-r1.apk) = 22021
 SHA256 (wifibox-alpine/libcap-getcap-2.69-r1.apk) = 94c26c778bd092a47b289440dc51ab31f2b41f37a6fe3276ab63821ca4406340
 SIZE (wifibox-alpine/libcap-getcap-2.69-r1.apk) = 4344
 SHA256 (wifibox-alpine/libcap-setcap-2.69-r1.apk) = 2e8486c3ccee79f00e4a4ee01c65d76c758274b8196d120b8fcd545c01d767ae
 SIZE (wifibox-alpine/libcap-setcap-2.69-r1.apk) = 5368
 SHA256 (wifibox-alpine/libcap-utils-2.69-r1.apk) = cca42fa3b6826d3f9079b33f6d9029ab8aa1280bbd94e10118444bbc4e82d2a6
 SIZE (wifibox-alpine/libcap-utils-2.69-r1.apk) = 19356
 SHA256 (wifibox-alpine/libcrypto3-3.1.4-r5.apk) = 0d05fda166248f9322138098c7503f82aab83f5f9b781c4e02bf29fde67e9346
 SIZE (wifibox-alpine/libcrypto3-3.1.4-r5.apk) = 1743413
 SHA256 (wifibox-alpine/libmnl-1.0.5-r2.apk) = 322ce883205831dce94e90b6c3dee4fccb2099b8fa46ecc971dead14ce22deb4
 SIZE (wifibox-alpine/libmnl-1.0.5-r2.apk) = 9003
 SHA256 (wifibox-alpine/libnftnl-1.2.6-r0.apk) = c533fa38066450ae9c0c3f794e7314514280e4cd34d49ec199028599b6352d49
 SIZE (wifibox-alpine/libnftnl-1.2.6-r0.apk) = 67186
 SHA256 (wifibox-alpine/libnl3-3.9.0-r1.apk) = 1fc11f5762fad12b6bce1ccea5de684bf079ae1a0166bed26cb592cdb650e49b
 SIZE (wifibox-alpine/libnl3-3.9.0-r1.apk) = 324819
 SHA256 (wifibox-alpine/libssl3-3.1.4-r5.apk) = 7a2ca2d52169001c7df5bacf6439173d5d66cfd9e34d763afdcfba77f1d387fa
 SIZE (wifibox-alpine/libssl3-3.1.4-r5.apk) = 234047
 SHA256 (wifibox-alpine/musl-1.2.4_git20230717-r4.apk) = 7467f80e2e056ec2946a3d058c701e39b127fd4138ad1e1ea4fc6e2550b24d9b
 SIZE (wifibox-alpine/musl-1.2.4_git20230717-r4.apk) = 407278
 SHA256 (wifibox-alpine/openrc-0.52.1-r0.apk) = 9b66f15fc68cce018b69dcfaefe12ba821ea8eb6c7079777b6bcf10efe4df057
 SIZE (wifibox-alpine/openrc-0.52.1-r0.apk) = 472998
 SHA256 (wifibox-alpine/socat-1.8.0.0-r0.apk) = 408b447e7b751587311ba8fcbb10a5acccd8a8f0780449343418e09c17e986d2
 SIZE (wifibox-alpine/socat-1.8.0.0-r0.apk) = 79360
 SHA256 (wifibox-alpine/socat-with-udp-1.8.0.0-r0.apk) = 25a36d22f5486b51e7efd5a822e8cb79383efd8cc37b42673a595e36d6274722
 SIZE (wifibox-alpine/socat-with-udp-1.8.0.0-r0.apk) = 79179
 SHA256 (wifibox-alpine/uds_passthru-0.1.1-r3.apk) = 3973750cc6a46b20f0fde89eaa0f53835962eed1c5efb00d14e92acb62636c46
 SIZE (wifibox-alpine/uds_passthru-0.1.1-r3.apk) = 3009
 SHA256 (wifibox-alpine/radvd-2.19-r1.apk) = 2d8f06e6d61bb3a382dd6636dfe0ed8c2bc20306587dfd0b6c8b52c77e67bbe8
 SIZE (wifibox-alpine/radvd-2.19-r1.apk) = 49088
 SHA256 (wifibox-alpine/dhcpcd-10.0.6-r0.apk) = df6c680047bdf546224e81e4edd8eeae2abff59466d998ed98461d80219bac82
 SIZE (wifibox-alpine/dhcpcd-10.0.6-r0.apk) = 162875
 SHA256 (wifibox-alpine/pcsc-lite-libs-2.0.0-r2.apk) = ad80284af7e8eeda364990d781cbb524aac3621a34fd8e14e3ad3e7dd0e9d5b7
 SIZE (wifibox-alpine/pcsc-lite-libs-2.0.0-r2.apk) = 17918
 SHA256 (wifibox-alpine/wpa_supplicant-2.10-r7.apk) = 5f245f08a8da63c8b74eef63279c0b30ea70f02ee02036a33e37ec085e9c8435
 SIZE (wifibox-alpine/wpa_supplicant-2.10-r7.apk) = 857123
 SHA256 (wifibox-alpine/hostapd-2.10-r4.apk) = f2b6625e2d566efc1a3050316bbf3745622ad566a2f8f7a27fad8a38b0817969
 SIZE (wifibox-alpine/hostapd-2.10-r4.apk) = 515548
 SHA256 (wifibox-alpine/mbedtls-2.28.7-r0.apk) = 81b6f43a402f5bb8827bc497f787334d5d6092d99eeebea1d54bb9b50fa53c23
 SIZE (wifibox-alpine/mbedtls-2.28.7-r0.apk) = 304534
 SHA256 (wifibox-alpine/mDNSResponder-2200.80.16-r0.apk) = da0c3ea30944d1837a1a399cd2ef7f9b37115876bc8b11e7e17ce8c1ee70fcfc
 SIZE (wifibox-alpine/mDNSResponder-2200.80.16-r0.apk) = 187265
 SHA256 (wifibox-alpine/forwarding-0.1.0-r3.apk) = c726f55fb441c027b87f3b240ea36c0074bf7da2cd5850d001d74be47bcbbb8e
 SIZE (wifibox-alpine/forwarding-0.1.0-r3.apk) = 2561
 SHA256 (wifibox-alpine/libpcap-1.10.4-r1.apk) = a1c67637dac4dd1217e252616f68f6bea8a00de88d5818f73b704648b671b0c1
 SIZE (wifibox-alpine/libpcap-1.10.4-r1.apk) = 106847
 SHA256 (wifibox-alpine/tcpdump-4.99.4-r1.apk) = 34fc91461a4105fac1796d66be7bd789ec6ae4f3116fd56bc366f288815282b1
 SIZE (wifibox-alpine/tcpdump-4.99.4-r1.apk) = 379405
 SHA256 (wifibox-alpine/linux-lts-6.6.22-r1.apk) = 6de97b32aab0c9c514953658d44285aa7132fb5dc47e9b30b840ec7ad6ef9727
 SIZE (wifibox-alpine/linux-lts-6.6.22-r1.apk) = 7193218
 SHA256 (wifibox-alpine/linux-edge-6.8.1-r1.apk) = 93e8246cd88d3e4e03b6dc94d0076db213fb2cd925b9f0f4532639c97e920d1d
 SIZE (wifibox-alpine/linux-edge-6.8.1-r1.apk) = 7209761
 SHA256 (wifibox-alpine/rtl8821ce-20240120-r06060220100.apk) = 880c865a5be3a6faf101a78cb254d033504f72e9c13a479183a030d183b1279d
 SIZE (wifibox-alpine/rtl8821ce-20240120-r06060220100.apk) = 598730
 SHA256 (wifibox-alpine/rtw88-20240316-r06060220100.apk) = 050b588e1f19dde9f80b11ed3beff736c05c2e6c322264e1ddc36c1a64484565
 SIZE (wifibox-alpine/rtw88-20240316-r06060220100.apk) = 194201
 SHA256 (wifibox-alpine/rtl8821ce-edge-20240120-r06080010100.apk) = 35062fee8d7c6ec317903ffcadb78f11f3bb5e530752140e10d77f06a038d27f
 SIZE (wifibox-alpine/rtl8821ce-edge-20240120-r06080010100.apk) = 598056
 SHA256 (wifibox-alpine/rtw88-edge-20240316-r06080010100.apk) = 62fe2c87b04f5e86d46bfd0bd87d97cc42563eaf19a27806f80c021b76a068a3
 SIZE (wifibox-alpine/rtw88-edge-20240316-r06080010100.apk) = 194890
-SHA256 (wifibox-alpine/rtw89-20240310-r06060220100.apk) = abbcd2da0acb29a9a6a2aaf86716f60cf564b17e73ca97ada9d36c462ec496e8
-SIZE (wifibox-alpine/rtw89-20240310-r06060220100.apk) = 467416
-SHA256 (wifibox-alpine/rtw89-edge-20240310-r06080010100.apk) = 8f9872b21328efe1508c1aa7e11d53cd65e2f5e4131f201ed57b18b506c449b6
-SIZE (wifibox-alpine/rtw89-edge-20240310-r06080010100.apk) = 467502
+SHA256 (wifibox-alpine/rtw89-20240106-r06060220100.apk) = 961719596caa90522773a9ffe17d760ff2bdfda02eece413063d4f994e4d155f
+SIZE (wifibox-alpine/rtw89-20240106-r06060220100.apk) = 410651
+SHA256 (wifibox-alpine/rtw89-edge-20240106-r06080010100.apk) = 173a44c79d9f0f7df18eed1e5d487d4b7a4ea5a6641f32acaa3bda810456d768
+SIZE (wifibox-alpine/rtw89-edge-20240106-r06080010100.apk) = 411361
 SHA256 (wifibox-alpine/broadcom-wl-6.30.223.271-r06060220100.apk) = e42f9e0871e89105911ff09c5df7c87e0d55c8a5c9cf76c30d094f31625cb15e
 SIZE (wifibox-alpine/broadcom-wl-6.30.223.271-r06060220100.apk) = 1465323
 SHA256 (wifibox-alpine/broadcom-wl-edge-6.30.223.271-r06080010100.apk) = 964ddfe0b7d7a0de3a0069ca7361438e9eb5b0ebc5b5bc7772bdc57cddc00c3f
 SIZE (wifibox-alpine/broadcom-wl-edge-6.30.223.271-r06080010100.apk) = 1464431
 SHA256 (wifibox-alpine/atmel-firmware-1.3.tar.gz) = f53160b0b4a824754957d8488f1eba68d3c6379d48c563464bd3924e7be19b3d
 SIZE (wifibox-alpine/atmel-firmware-1.3.tar.gz) = 470254
 SHA256 (wifibox-alpine/wl_apsta-3.130.20.0.o) = 7dba610b1d96dd14e901bcbce14cd6ecd1b1ac6f5c0035b0d6b6dc46a7c3ef90
 SIZE (wifibox-alpine/wl_apsta-3.130.20.0.o) = 652866
 SHA256 (wifibox-alpine/broadcom-wl-6.30.163.46.tar.bz2) = a07c3b6b277833c7dbe61daa511f908cd66c5e2763eb7a0859abc36cd9335c2d
 SIZE (wifibox-alpine/broadcom-wl-6.30.163.46.tar.bz2) = 7684610
 SHA256 (wifibox-alpine/2135e201e7a9339e018d4e2d4a33c73266e674d7.zip) = 7c9c69184bea159c6a6a885ffbafe878d9bb0e5d6d0fc2aeba010ee42c8fdd33
 SIZE (wifibox-alpine/2135e201e7a9339e018d4e2d4a33c73266e674d7.zip) = 12509641
-SHA256 (wifibox-alpine/pgj-freebsd-wifibox-alpine-fe9b384e45c57b0cfafe5e5b3931ba163f4230fd_GH0.tar.gz) = ca977198e9ce1e0fa4e95cda5c2f435ad6d829f2edd597ea697e0a58dfdb6475
-SIZE (wifibox-alpine/pgj-freebsd-wifibox-alpine-fe9b384e45c57b0cfafe5e5b3931ba163f4230fd_GH0.tar.gz) = 208406
+SHA256 (wifibox-alpine/pgj-freebsd-wifibox-alpine-3ce5b1faf48ef4b9d52c38bf518aa612242fba3f_GH0.tar.gz) = 69d1feb931b3230b3577487cf21a7a008058442c8064b1f4f1a535d6838a212f
+SIZE (wifibox-alpine/pgj-freebsd-wifibox-alpine-3ce5b1faf48ef4b9d52c38bf518aa612242fba3f_GH0.tar.gz) = 208422
diff --git a/net/wifibox/Makefile b/net/wifibox/Makefile
index 61de81e65992..8cefe54e1f87 100644
--- a/net/wifibox/Makefile
+++ b/net/wifibox/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	wifibox
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES=	net
 
 MAINTAINER=	pali.gabor@gmail.com
 COMMENT=	Wireless card driver via virtualized Linux
 WWW=		https://github.com/pgj/freebsd-wifibox
 
 ONLY_FOR_ARCHS=	amd64
 
 RUN_DEPENDS=	wifibox-core>0:net/wifibox-core
 
 USES=	metaport
 
 .include "${.CURDIR}/../wifibox-alpine/flavors.mk"
 
 .for flavor in ${_FLAVORS}
 ${flavor}_RUN_DEPENDS=         wifibox-alpine-${flavor}>0:net/wifibox-alpine@${flavor}
 ${flavor}_PKGNAMESUFFIX=       -${flavor}
 .endfor
 
 default_RUN_DEPENDS=           wifibox-alpine>0:net/wifibox-alpine
 
 .include <bsd.port.mk>