diff --git a/net/hostapd/Makefile b/net/hostapd/Makefile
index 1e6d5841681a..e4951adea292 100644
--- a/net/hostapd/Makefile
+++ b/net/hostapd/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	hostapd
 PORTVERSION=	2.10
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	net
 MASTER_SITES=	https://w1.fi/releases/
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
 WWW=		https://w1.fi/hostapd/
 
 LICENSE=	BSD3CLAUSE
 
 USES=		cpe gmake ssl
 CPE_VENDOR=	w1.fi
 BUILD_WRKSRC=	${WRKSRC}/hostapd
 CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 
 PLIST_FILES=	sbin/hostapd sbin/hostapd_cli man/man1/hostapd_cli.1.gz \
 		man/man8/hostapd.8.gz
 .if !exists(/etc/rc.d/hostapd)
 USE_RC_SUBR=	hostapd
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|@$$(E) "  CC " $$<|@$$(E) "  $$(CC) " $$<|' \
 		${BUILD_WRKSRC}/Makefile
 	@${SED} -e 's|@PREFIX@|${PREFIX}|g' ${FILESDIR}/config \
 		>> ${WRKSRC}/hostapd/.config
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hostapd/hostapd ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_PROGRAM} ${WRKSRC}/hostapd/hostapd_cli \
 		${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/hostapd/hostapd_cli.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/hostapd/hostapd.8 \
 		${STAGEDIR}${MANPREFIX}/man/man8
 
 .include <bsd.port.mk>
diff --git a/net/hostapd/files/patch-src_l2__packet_l2__packet__freebsd.c b/net/hostapd/files/patch-src_l2__packet_l2__packet__freebsd.c
index 9d290e5dff5c..e0aa170fa91f 100644
--- a/net/hostapd/files/patch-src_l2__packet_l2__packet__freebsd.c
+++ b/net/hostapd/files/patch-src_l2__packet_l2__packet__freebsd.c
@@ -1,48 +1,74 @@
 --- src/l2_packet/l2_packet_freebsd.c.orig	2022-01-16 12:51:29.000000000 -0800
-+++ src/l2_packet/l2_packet_freebsd.c	2023-09-11 22:00:09.826831000 -0700
++++ src/l2_packet/l2_packet_freebsd.c	2023-09-11 22:21:12.054042000 -0700
 @@ -8,7 +8,10 @@
   */
  
  #include "includes.h"
 -#if defined(__APPLE__) || defined(__GLIBC__)
 +#if defined(__FreeBSD__) \
 + || defined(__DragonFly__) \
 + || defined(__APPLE__) \
 + || defined(__GLIBC__)
  #include <net/bpf.h>
  #endif /* __APPLE__ */
  #include <pcap.h>
-@@ -76,24 +79,28 @@
+@@ -20,6 +23,7 @@
+ #include <sys/sysctl.h>
+ #endif /* __sun__ */
+ 
++#include <net/ethernet.h>
+ #include <net/if.h>
+ #include <net/if_dl.h>
+ #include <net/route.h>
+@@ -76,24 +80,33 @@
  {
  	struct l2_packet_data *l2 = eloop_ctx;
  	pcap_t *pcap = sock_ctx;
 -	struct pcap_pkthdr hdr;
 +	struct pcap_pkthdr *hdr;
  	const u_char *packet;
  	struct l2_ethhdr *ethhdr;
  	unsigned char *buf;
  	size_t len;
  
 -	packet = pcap_next(pcap, &hdr);
 +	if (pcap_next_ex(pcap, &hdr, &packet) == -1) {
 +		wpa_printf(MSG_ERROR, "Error reading packet, has device disappeared?");
 +		packet = NULL;
 +		eloop_terminate();
 +	}
  
 -	if (!l2->rx_callback || !packet || hdr.caplen < sizeof(*ethhdr))
 +	if (!l2->rx_callback || !packet || hdr->caplen < sizeof(*ethhdr))
  		return;
  
  	ethhdr = (struct l2_ethhdr *) packet;
  	if (l2->l2_hdr) {
  		buf = (unsigned char *) ethhdr;
 -		len = hdr.caplen;
 +		len = hdr->caplen;
  	} else {
  		buf = (unsigned char *) (ethhdr + 1);
 -		len = hdr.caplen - sizeof(*ethhdr);
 +		len = hdr->caplen - sizeof(*ethhdr);
++		/* handle 8021Q encapsulated frames */
++		if (ethhdr->h_proto == htons(ETH_P_8021Q)) {
++			buf += ETHER_VLAN_ENCAP_LEN;
++			len -= ETHER_VLAN_ENCAP_LEN;
++		}
  	}
  	l2->rx_callback(l2->rx_callback_ctx, ethhdr->h_source, buf, len);
  }
+@@ -122,10 +135,10 @@
+ 	os_snprintf(pcap_filter, sizeof(pcap_filter),
+ 		    "not ether src " MACSTR " and "
+ 		    "( ether dst " MACSTR " or ether dst " MACSTR " ) and "
+-		    "ether proto 0x%x",
++		    "( ether proto 0x%x or ( vlan 0 and ether proto 0x%x ) )",
+ 		    MAC2STR(l2->own_addr), /* do not receive own packets */
+ 		    MAC2STR(l2->own_addr), MAC2STR(pae_group_addr),
+-		    protocol);
++		    protocol, protocol);
+ 	if (pcap_compile(l2->pcap, &pcap_fp, pcap_filter, 1, pcap_netp) < 0) {
+ 		fprintf(stderr, "pcap_compile: %s\n", pcap_geterr(l2->pcap));
+ 		return -1;