diff --git a/comms/iwmbt-firmware/Makefile b/comms/iwmbt-firmware/Makefile
index 12f53049f9f9..2f7452640ef1 100644
--- a/comms/iwmbt-firmware/Makefile
+++ b/comms/iwmbt-firmware/Makefile
@@ -1,32 +1,31 @@
 # Created by: Vladimir Kondratyev <wulf@FreeBSD.org>
 
 PORTNAME=	iwmbt-firmware
-PORTVERSION=	20190717
-PORTREVISION=	1
+PORTVERSION=	20210315
+DEB_REVISION=	2
 CATEGORIES=	comms
 MASTER_SITES=	DEBIAN/pool/non-free/f/firmware-nonfree/
-DISTNAME=	firmware-iwlwifi_${PORTVERSION}-2_all
+DISTNAME=	firmware-iwlwifi_${PORTVERSION}-${DEB_REVISION}_all
 EXTRACT_SUFX=	.deb
 
 MAINTAINER=	wulf@FreeBSD.org
 COMMENT=	Intel Wireless 8260 bluetooth adaptor firmwares used by iwmbtfw(8)
 
 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
 
 EXTRACT_CMD=	${AR}
 EXTRACT_BEFORE_ARGS=	-p
 EXTRACT_AFTER_ARGS=	data.tar.xz | ${TAR} -xf - ${EXTRACT_FILES}
-EXTRACT_FILES=	lib/firmware/intel/ibt-*.sfi \
-		lib/firmware/intel/ibt-*.ddc \
+EXTRACT_FILES=	lib/firmware/intel \
 		usr/share/doc/firmware-iwlwifi/copyright
 
 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 798e912255c5..39c217e5173a 100644
--- a/comms/iwmbt-firmware/distinfo
+++ b/comms/iwmbt-firmware/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1573955442
-SHA256 (firmware-iwlwifi_20190717-2_all.deb) = c51d62bba3f4936b78a97b568f61a5a9c67b90e269448dbdcc81884e5874c953
-SIZE (firmware-iwlwifi_20190717-2_all.deb) = 6789424
+TIMESTAMP = 1618343881
+SHA256 (firmware-iwlwifi_20210315-2_all.deb) = 4c904f8f226b682f63f3d6873f90fc3623bad3ac2e50dc1575bd1989aaf4102a
+SIZE (firmware-iwlwifi_20210315-2_all.deb) = 13447656
diff --git a/comms/iwmbt-firmware/pkg-plist b/comms/iwmbt-firmware/pkg-plist
index 360dd82def01..684ec12e813b 100644
--- a/comms/iwmbt-firmware/pkg-plist
+++ b/comms/iwmbt-firmware/pkg-plist
@@ -1,26 +1,47 @@
+%%DATADIR%%/ibt-0041-0041.ddc
+%%DATADIR%%/ibt-0041-0041.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-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