diff --git a/net/wifibox/Makefile b/net/wifibox/Makefile
index 20b41b50b52e..ff86ef0eff69 100644
--- a/net/wifibox/Makefile
+++ b/net/wifibox/Makefile
@@ -1,55 +1,59 @@
 PORTNAME=	wifibox
-PORTVERSION=	0.7.0
+PORTVERSION=	0.8.0
 CATEGORIES=	net
 
 MAINTAINER=	pali.gabor@gmail.com
 COMMENT=	Wireless card driver via virtualized Linux
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64
 EXTRACT_ONLY=	${_DISTFILES:N*.img.xz}
 
 RUN_DEPENDS=	grub2-bhyve>0:sysutils/grub2-bhyve
 
-OPTIONS_DEFINE=			BHYVE_PLUS
+OPTIONS_DEFINE=			BHYVE_PLUS WPA_PASSTHRU
+OPTIONS_DEFAULT=		WPA_PASSTHRU
 OPTIONS_EXCLUDE_FreeBSD_12=	BHYVE_PLUS
 
 BHYVE_PLUS_DESC=		Use bhyve+ (experimental)
+WPA_PASSTHRU_DESC=		Support WPA Supplicant pass-through
+
+WPA_PASSTHRU_RUN_DEPENDS=	socat>0:net/socat
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MBHYVE_PLUS} || (${OSVERSION} < 1300000)
 RUN_DEPENDS+=	bhyve+>0:sysutils/bhyve+
 _BHYVE_PLUS=	yes
 .endif
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	pgj
 GH_PROJECT=	freebsd-wifibox freebsd-wifibox-image:image
 GH_TAGNAME=	${PORTVERSION}
 GH_TAGNAME+=	${IMAGE_VERSION}:image
 
-IMAGE_VERSION=	snapshot-20220208
+IMAGE_VERSION=	snapshot-20220307
 IMAGE_FILE=	freebsd-wifibox-appliance.${IMAGE_VERSION}.img.xz
 IMAGE_MAN=	wifibox-alpine.5
 
 MASTER_SITES+=	https://github.com/pgj/freebsd-wifibox-image/releases/download/${IMAGE_VERSION}/
 DISTFILES+=	${IMAGE_FILE}
 
 # Needed to fake the necessary UID/GID for chrony that runs in the guest
 USERS=		squid quagga
 GROUPS=		squid quagga
 
 NO_BUILD=	yes
 MAKE_ENV+=	IMGXZ=${DISTDIR}/${IMAGE_FILE} \
 		IMGMAN=${WRKSRC_image}/man/${IMAGE_MAN} \
 		VERSION=${PORTVERSION}
 .if defined(_BHYVE_PLUS)
 MAKE_ENV+=	BHYVE=${LOCALBASE}/sbin/bhyve \
 		BHYVECTL=${LOCALBASE}/sbin/bhyvectl \
 		VMM_KO=${KMODDIR}/vmm.ko
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/wifibox/distinfo b/net/wifibox/distinfo
index 2bfeec77d584..766e1c6ebd79 100644
--- a/net/wifibox/distinfo
+++ b/net/wifibox/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1644284102
-SHA256 (freebsd-wifibox-appliance.snapshot-20220208.img.xz) = 8ec66a8c75516a8102bbdc5bff6a70bb5a4a02eb81f6d3b92851a4ae7f66c8d6
-SIZE (freebsd-wifibox-appliance.snapshot-20220208.img.xz) = 155056624
-SHA256 (pgj-freebsd-wifibox-0.7.0_GH0.tar.gz) = 9e6287552243a38bdde6091da950846eaa53a767d86dfbad0251552a7ef2a8ff
-SIZE (pgj-freebsd-wifibox-0.7.0_GH0.tar.gz) = 12758
-SHA256 (pgj-freebsd-wifibox-image-snapshot-20220208_GH0.tar.gz) = 65a0467da0c667622e9df355b8389aa629484f0add420b8a98c7e7a97cc53bf7
-SIZE (pgj-freebsd-wifibox-image-snapshot-20220208_GH0.tar.gz) = 5445
+TIMESTAMP = 1646684398
+SHA256 (freebsd-wifibox-appliance.snapshot-20220307.img.xz) = 40ccab2fcf4081f04bf0c4725e86316d173c06a3065fab6d40369bfe4739ef6d
+SIZE (freebsd-wifibox-appliance.snapshot-20220307.img.xz) = 127884672
+SHA256 (pgj-freebsd-wifibox-0.8.0_GH0.tar.gz) = 6f0e71817aad31a28c1175832e8ba247c8fe34100561e55033caed316d2f2316
+SIZE (pgj-freebsd-wifibox-0.8.0_GH0.tar.gz) = 14610
+SHA256 (pgj-freebsd-wifibox-image-snapshot-20220307_GH0.tar.gz) = d5fb8d101a4d7b0e4057beb36f652b66869064eb96eb587871c1894ce6fc850d
+SIZE (pgj-freebsd-wifibox-image-snapshot-20220307_GH0.tar.gz) = 5744
diff --git a/net/wifibox/pkg-plist b/net/wifibox/pkg-plist
index ceb37985706d..0653960bf262 100644
--- a/net/wifibox/pkg-plist
+++ b/net/wifibox/pkg-plist
@@ -1,36 +1,37 @@
 @sample etc/wifibox/bhyve.conf.sample
 @sample etc/wifibox/core.conf.sample
 @sample etc/wifibox/interfaces.conf.sample
 @sample etc/wifibox/udhcpd.conf.sample
-@sample etc/wifibox/wpa_supplicant.conf.sample
+@sample etc/wifibox/wpa_ctrl.conf.sample
+@sample etc/wifibox/wpa_supplicant/wpa_supplicant.conf.sample
 @sample etc/devd/wifibox.conf.sample
 etc/rc.d/wifibox
 man/man5/wifibox-alpine.5.gz
 man/man5/wifibox-guest.5.gz
 man/man8/wifibox.8.gz
 sbin/wifibox
 share/wifibox/device.map
 share/wifibox/grub.cfg
 share/wifibox/disk.img
+/var/run/wifibox/appliance/run
 @preexec /usr/bin/touch /var/log/wifibox.log
 @preunexec /bin/rm -f /var/log/wifibox.log
 @preunexec /usr/bin/find /var/run/wifibox -type f -delete
-@preunexec /usr/bin/find /var/run/wifibox -type l -exec /bin/rm -f {} \;
 @dir /var/run/wifibox/appliance/cache
 @dir /var/run/wifibox/appliance/empty
 @dir /var/run/wifibox/appliance/lib/apk
 @dir(squid,quagga,) /var/run/wifibox/appliance/lib/chrony
 @dir /var/run/wifibox/appliance/lib/iptables
 @dir /var/run/wifibox/appliance/lib/misc
 @dir /var/run/wifibox/appliance/lib/udhcpd
 @dir /var/run/wifibox/appliance/lib
 @dir /var/run/wifibox/appliance/local
 @dir(squid,quagga,) /var/run/wifibox/appliance/log/chrony
 @dir /var/run/wifibox/appliance/log
 @dir /var/run/wifibox/appliance/mail
 @dir /var/run/wifibox/appliance/opt
 @dir /var/run/wifibox/appliance/spool/cron
 @dir /var/run/wifibox/appliance/spool
 @dir /var/run/wifibox/appliance/tmp
 @dir /var/run/wifibox/appliance
 @dir /var/run/wifibox