diff --git a/comms/iwmbt-firmware/Makefile b/comms/iwmbt-firmware/Makefile
index 05e91cc00ae1..fdb51b5b652b 100644
--- a/comms/iwmbt-firmware/Makefile
+++ b/comms/iwmbt-firmware/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	iwmbt-firmware
-PORTVERSION=	20221109
-DEB_REVISION=	2
+DISTVERSION=	20230515
+DEB_REVISION=	3
 CATEGORIES=	comms
-MASTER_SITES=	DEBIAN/pool/non-free/f/firmware-nonfree/:main \
+MASTER_SITES=	DEBIAN/pool/non-free-firmware/f/firmware-nonfree/:main \
 		https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/intel/:old
 DISTFILES=	${MAINFW_FILE}:main \
 		${OLDFW_FILE}${OLDFW_SUFX}:old
 EXTRACT_ONLY=	${MAINFW_FILE}
 
 MAINTAINER=	wulf@FreeBSD.org
 COMMENT=	Intel Wireless 8260 bluetooth adaptor firmwares used by iwmbtfw(8)
 WWW=		https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
 
 LICENSE=	INTEL
 LICENSE_NAME=	Intel firmware license
 LICENSE_FILE=	${WRKDIR}/usr/share/doc/firmware-iwlwifi/copyright
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
-MAINFW_FILE=	firmware-iwlwifi_${PORTVERSION}-${DEB_REVISION}_all.deb
+MAINFW_FILE=	firmware-iwlwifi_${DISTVERSION}-${DEB_REVISION}_all.deb
 OLDFW_FILE=	ibt-hw-37.8.10-fw-22.50.19.14.f.bseq
 OLDFW_SUFX=	?id=6be4747ea1d731f661c5320acf3f1273a459d6da
 
 EXTRACT_CMD=	${AR}
 EXTRACT_BEFORE_ARGS=	-p
 EXTRACT_AFTER_ARGS=	data.tar.xz | ${TAR} -xf - ${EXTRACT_FILES}
 EXTRACT_FILES=	lib/firmware/intel \
 		usr/share/doc/firmware-iwlwifi/copyright
 
 # PR/267581: Downgrade ibt-hw-37.8.10-fw-22.50.19.14.f.bseq to fw_patch_num 36
 post-extract:
 	${CP} ${DISTDIR}/${OLDFW_FILE}${OLDFW_SUFX} ${WRKDIR}/lib/firmware/intel/${OLDFW_FILE}
 
 do-install:
 	cd ${WRKDIR}/lib/firmware/intel && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/comms/iwmbt-firmware/distinfo b/comms/iwmbt-firmware/distinfo
index f4a1130c9e01..442598f0b0ec 100644
--- a/comms/iwmbt-firmware/distinfo
+++ b/comms/iwmbt-firmware/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1669462817
-SHA256 (firmware-iwlwifi_20221109-2_all.deb) = 593f01beec59fd4de2f76a907a32798bac4f4658ff5b22624f4eb8528e8c2370
-SIZE (firmware-iwlwifi_20221109-2_all.deb) = 20085936
+TIMESTAMP = 1693140290
+SHA256 (firmware-iwlwifi_20230515-3_all.deb) = bd6071baa22b43271958be577ed886032a96c6a2552cc5e476d8b960e20cc0fd
+SIZE (firmware-iwlwifi_20230515-3_all.deb) = 9445988
 SHA256 (ibt-hw-37.8.10-fw-22.50.19.14.f.bseq?id=6be4747ea1d731f661c5320acf3f1273a459d6da) = d1d25082ee30e971454e512e6a07af9c093bb8086f3b56f6afcc22de8e63d59a
 SIZE (ibt-hw-37.8.10-fw-22.50.19.14.f.bseq?id=6be4747ea1d731f661c5320acf3f1273a459d6da) = 47463
diff --git a/comms/iwmbt-firmware/pkg-plist b/comms/iwmbt-firmware/pkg-plist
index 18b7bf471cd4..8652c477ab80 100644
--- a/comms/iwmbt-firmware/pkg-plist
+++ b/comms/iwmbt-firmware/pkg-plist
@@ -1,49 +1,57 @@
 %%DATADIR%%/ibt-0040-0041.ddc
 %%DATADIR%%/ibt-0040-0041.sfi
+%%DATADIR%%/ibt-0040-4150.ddc
+%%DATADIR%%/ibt-0040-4150.sfi
 %%DATADIR%%/ibt-0041-0041.ddc
 %%DATADIR%%/ibt-0041-0041.sfi
+%%DATADIR%%/ibt-1040-0041.ddc
+%%DATADIR%%/ibt-1040-0041.sfi
+%%DATADIR%%/ibt-1040-4150.ddc
+%%DATADIR%%/ibt-1040-4150.sfi
 %%DATADIR%%/ibt-11-5.ddc
 %%DATADIR%%/ibt-11-5.sfi
 %%DATADIR%%/ibt-12-16.ddc
 %%DATADIR%%/ibt-12-16.sfi
 %%DATADIR%%/ibt-17-0-1.ddc
 %%DATADIR%%/ibt-17-0-1.sfi
 %%DATADIR%%/ibt-17-16-1.ddc
 %%DATADIR%%/ibt-17-16-1.sfi
 %%DATADIR%%/ibt-18-0-1.ddc
 %%DATADIR%%/ibt-18-0-1.sfi
 %%DATADIR%%/ibt-18-16-1.ddc
 %%DATADIR%%/ibt-18-16-1.sfi
 %%DATADIR%%/ibt-19-0-0.ddc
 %%DATADIR%%/ibt-19-0-0.sfi
 %%DATADIR%%/ibt-19-0-1.ddc
 %%DATADIR%%/ibt-19-0-1.sfi
+%%DATADIR%%/ibt-19-0-3.ddc
+%%DATADIR%%/ibt-19-0-3.sfi
 %%DATADIR%%/ibt-19-0-4.ddc
 %%DATADIR%%/ibt-19-0-4.sfi
 %%DATADIR%%/ibt-19-16-4.ddc
 %%DATADIR%%/ibt-19-16-4.sfi
 %%DATADIR%%/ibt-19-240-1.ddc
 %%DATADIR%%/ibt-19-240-1.sfi
 %%DATADIR%%/ibt-19-240-4.ddc
 %%DATADIR%%/ibt-19-240-4.sfi
 %%DATADIR%%/ibt-19-32-0.ddc
 %%DATADIR%%/ibt-19-32-0.sfi
 %%DATADIR%%/ibt-19-32-1.ddc
 %%DATADIR%%/ibt-19-32-1.sfi
 %%DATADIR%%/ibt-19-32-4.ddc
 %%DATADIR%%/ibt-19-32-4.sfi
 %%DATADIR%%/ibt-20-0-3.ddc
 %%DATADIR%%/ibt-20-0-3.sfi
 %%DATADIR%%/ibt-20-1-3.ddc
 %%DATADIR%%/ibt-20-1-3.sfi
 %%DATADIR%%/ibt-20-1-4.ddc
 %%DATADIR%%/ibt-20-1-4.sfi
 %%DATADIR%%/ibt-hw-37.7.10-fw-1.0.1.2d.d.bseq
 %%DATADIR%%/ibt-hw-37.7.10-fw-1.0.2.3.d.bseq
 %%DATADIR%%/ibt-hw-37.7.10-fw-1.80.1.2d.d.bseq
 %%DATADIR%%/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq
 %%DATADIR%%/ibt-hw-37.7.bseq
 %%DATADIR%%/ibt-hw-37.8.10-fw-1.10.2.27.d.bseq
 %%DATADIR%%/ibt-hw-37.8.10-fw-1.10.3.11.e.bseq
 %%DATADIR%%/ibt-hw-37.8.10-fw-22.50.19.14.f.bseq
 %%DATADIR%%/ibt-hw-37.8.bseq