diff --git a/sysutils/devcpu-data/Makefile b/sysutils/devcpu-data/Makefile
index 3ca35c626ecf..1a822c2f4ece 100644
--- a/sysutils/devcpu-data/Makefile
+++ b/sysutils/devcpu-data/Makefile
@@ -1,47 +1,47 @@
 # Created by: stas
 
 PORTNAME=	data
-PORTVERSION=	1.38
+PORTVERSION=	1.39
 CATEGORIES=	sysutils
 MASTER_SITES=	LOCAL/sbruno:amd
 PKGNAMEPREFIX=	devcpu-
 DISTFILES=	amd64-microcode.20191228.tar.xz:amd
 
 MAINTAINER=	sbruno@FreeBSD.org
 COMMENT=	Intel and AMD CPUs microcode updates
 
 LICENSE=	EULA
 LICENSE_NAME=	Intel Software License Agreement
 LICENSE_FILE=	${FILESDIR}/LICENSE
 LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	intel
 GH_PROJECT=	Intel-Linux-Processor-Microcode-Data-Files
-GH_TAGNAME=	microcode-20210216
+GH_TAGNAME=	microcode-20210608
 
 ONLY_FOR_ARCHS=	amd64 i386
 NO_ARCH=	yes
 NO_WRKSUBDIR=	yes
 
 DATADIR=	${PREFIX}/share/cpucontrol
 FWDIR=		/boot/firmware
 
 USE_RC_SUBR=	microcode_update
 
 post-extract:
 	${CP} -p ${FILESDIR}/Makefile ${FILESDIR}/ucode-split.c ${WRKSRC}
 	${REINPLACE_CMD} 's|%%GH_TAGNAME%%|${GH_TAGNAME}|g' ${WRKSRC}/Makefile
 	${CAT} ${WRKSRC}/Intel-Linux-Processor-Microcode-Data-Files-${GH_TAGNAME}/intel-ucode/* ${WRKSRC}/Intel-Linux-Processor-Microcode-Data-Files-${GH_TAGNAME}/intel-ucode-with-caveats/* > ${WRKSRC}/intel-ucode.bin
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/microcode_amd.bin ${STAGEDIR}${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/microcode_amd_fam15h.bin ${STAGEDIR}${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/microcode_amd_fam16h.bin ${STAGEDIR}${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/microcode_amd_fam17h.bin ${STAGEDIR}${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/mcodes/* ${STAGEDIR}${DATADIR}/
 	${MKDIR} ${STAGEDIR}${FWDIR}
 	${INSTALL_DATA} ${WRKSRC}/intel-ucode.bin ${STAGEDIR}${FWDIR}/
 
 .include <bsd.port.mk>
diff --git a/sysutils/devcpu-data/distinfo b/sysutils/devcpu-data/distinfo
index ed9dd12e4408..06b3847dded6 100644
--- a/sysutils/devcpu-data/distinfo
+++ b/sysutils/devcpu-data/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1613574444
+TIMESTAMP = 1623192235
 SHA256 (amd64-microcode.20191228.tar.xz) = 156eef8950f28436e045c1d5ac6e4738d99c07a6737d35bf966901f4b260abb3
 SIZE (amd64-microcode.20191228.tar.xz) = 28827
-SHA256 (intel-Intel-Linux-Processor-Microcode-Data-Files-1.38-microcode-20210216_GH0.tar.gz) = b855c81f78705f35341248a0603aa1a6e199ca7f59cd425e061b579329aa9eaa
-SIZE (intel-Intel-Linux-Processor-Microcode-Data-Files-1.38-microcode-20210216_GH0.tar.gz) = 3506111
+SHA256 (intel-Intel-Linux-Processor-Microcode-Data-Files-1.39-microcode-20210608_GH0.tar.gz) = fd85b6b769efd029dec6a2c07106fd18fb4dcb548b7bc4cde09295a8344ef6d7
+SIZE (intel-Intel-Linux-Processor-Microcode-Data-Files-1.39-microcode-20210608_GH0.tar.gz) = 4782451
diff --git a/sysutils/devcpu-data/pkg-plist b/sysutils/devcpu-data/pkg-plist
index aa1203f5a10d..ed0fa8528474 100644
--- a/sysutils/devcpu-data/pkg-plist
+++ b/sysutils/devcpu-data/pkg-plist
@@ -1,198 +1,208 @@
 %%DATADIR%%/06-03-02.00
 %%DATADIR%%/06-05-00.01
 %%DATADIR%%/06-05-00.02
 %%DATADIR%%/06-05-00.08
 %%DATADIR%%/06-05-01.01
 %%DATADIR%%/06-05-02.01
 %%DATADIR%%/06-05-02.02
 %%DATADIR%%/06-05-02.04
 %%DATADIR%%/06-05-03.01
 %%DATADIR%%/06-05-03.02
 %%DATADIR%%/06-05-03.04
 %%DATADIR%%/06-05-03.08
 %%DATADIR%%/06-06-00.01
 %%DATADIR%%/06-06-05.10
 %%DATADIR%%/06-06-0a.02
 %%DATADIR%%/06-06-0a.08
 %%DATADIR%%/06-06-0a.20
 %%DATADIR%%/06-06-0d.02
 %%DATADIR%%/06-06-0d.08
 %%DATADIR%%/06-06-0d.20
 %%DATADIR%%/06-07-01.04
 %%DATADIR%%/06-07-02.04
 %%DATADIR%%/06-07-03.04
 %%DATADIR%%/06-08-01.01
 %%DATADIR%%/06-08-01.04
 %%DATADIR%%/06-08-01.08
 %%DATADIR%%/06-08-01.10
 %%DATADIR%%/06-08-01.20
 %%DATADIR%%/06-08-03.08
 %%DATADIR%%/06-08-03.20
 %%DATADIR%%/06-08-06.01
 %%DATADIR%%/06-08-06.02
 %%DATADIR%%/06-08-06.04
 %%DATADIR%%/06-08-06.10
 %%DATADIR%%/06-08-06.80
 %%DATADIR%%/06-08-0a.10
 %%DATADIR%%/06-08-0a.20
 %%DATADIR%%/06-08-0a.80
 %%DATADIR%%/06-09-05.10
 %%DATADIR%%/06-09-05.20
 %%DATADIR%%/06-09-05.80
 %%DATADIR%%/06-0a-00.04
 %%DATADIR%%/06-0a-01.04
 %%DATADIR%%/06-0b-01.10
 %%DATADIR%%/06-0b-01.20
 %%DATADIR%%/06-0b-04.10
 %%DATADIR%%/06-0b-04.20
 %%DATADIR%%/06-0d-06.20
 %%DATADIR%%/06-0e-08.20
 %%DATADIR%%/06-0e-0c.20
 %%DATADIR%%/06-0e-0c.80
 %%DATADIR%%/06-0f-02.01
 %%DATADIR%%/06-0f-02.20
 %%DATADIR%%/06-0f-06.01
 %%DATADIR%%/06-0f-06.04
 %%DATADIR%%/06-0f-06.20
 %%DATADIR%%/06-0f-07.10
 %%DATADIR%%/06-0f-07.40
 %%DATADIR%%/06-0f-0a.80
 %%DATADIR%%/06-0f-0b.01
 %%DATADIR%%/06-0f-0b.04
 %%DATADIR%%/06-0f-0b.08
 %%DATADIR%%/06-0f-0b.10
 %%DATADIR%%/06-0f-0b.20
 %%DATADIR%%/06-0f-0b.40
 %%DATADIR%%/06-0f-0b.80
 %%DATADIR%%/06-0f-0d.01
 %%DATADIR%%/06-0f-0d.20
 %%DATADIR%%/06-0f-0d.80
 %%DATADIR%%/06-16-01.01
 %%DATADIR%%/06-16-01.02
 %%DATADIR%%/06-16-01.80
 %%DATADIR%%/06-17-06.01
 %%DATADIR%%/06-17-06.04
 %%DATADIR%%/06-17-06.10
 %%DATADIR%%/06-17-06.40
 %%DATADIR%%/06-17-06.80
 %%DATADIR%%/06-17-07.10
 %%DATADIR%%/06-17-0a.11
 %%DATADIR%%/06-17-0a.44
 %%DATADIR%%/06-17-0a.a0
 %%DATADIR%%/06-1a-04.03
 %%DATADIR%%/06-1a-05.03
 %%DATADIR%%/06-1c-02.01
 %%DATADIR%%/06-1c-02.04
 %%DATADIR%%/06-1c-02.08
 %%DATADIR%%/06-1c-0a.01
 %%DATADIR%%/06-1c-0a.04
 %%DATADIR%%/06-1c-0a.08
 %%DATADIR%%/06-1c-0a.10
 %%DATADIR%%/06-1d-01.08
 %%DATADIR%%/06-1e-05.13
 %%DATADIR%%/06-25-02.12
 %%DATADIR%%/06-25-05.92
 %%DATADIR%%/06-26-01.01
 %%DATADIR%%/06-26-01.02
 %%DATADIR%%/06-2a-07.12
 %%DATADIR%%/06-2c-02.03
 %%DATADIR%%/06-2d-06.6d
 %%DATADIR%%/06-2d-07.6d
 %%DATADIR%%/06-2e-06.04
 %%DATADIR%%/06-2f-02.05
 %%DATADIR%%/06-37-08.02
 %%DATADIR%%/06-37-08.0c
 %%DATADIR%%/06-37-09.0f
 %%DATADIR%%/06-3a-09.12
 %%DATADIR%%/06-3c-03.32
 %%DATADIR%%/06-3d-04.c0
 %%DATADIR%%/06-3e-04.ed
 %%DATADIR%%/06-3e-06.ed
 %%DATADIR%%/06-3e-07.ed
 %%DATADIR%%/06-3f-02.6f
 %%DATADIR%%/06-3f-04.80
 %%DATADIR%%/06-45-01.72
 %%DATADIR%%/06-46-01.32
 %%DATADIR%%/06-47-01.22
 %%DATADIR%%/06-4c-03.01
 %%DATADIR%%/06-4c-04.01
 %%DATADIR%%/06-4d-08.01
 %%DATADIR%%/06-4e-03.c0
 %%DATADIR%%/06-55-03.97
 %%DATADIR%%/06-55-04.b7
+%%DATADIR%%/06-55-05.b7
 %%DATADIR%%/06-55-06.bf
 %%DATADIR%%/06-55-07.bf
 %%DATADIR%%/06-55-0b.bf
 %%DATADIR%%/06-56-02.10
 %%DATADIR%%/06-56-03.10
 %%DATADIR%%/06-56-04.10
 %%DATADIR%%/06-56-05.10
 %%DATADIR%%/06-5c-02.01
 %%DATADIR%%/06-5c-09.03
 %%DATADIR%%/06-5c-0a.03
 %%DATADIR%%/06-5e-03.36
 %%DATADIR%%/06-5f-01.01
 %%DATADIR%%/06-66-03.80
+%%DATADIR%%/06-6a-05.87
+%%DATADIR%%/06-6a-06.87
 %%DATADIR%%/06-7a-01.01
 %%DATADIR%%/06-7a-08.01
 %%DATADIR%%/06-7e-05.80
+%%DATADIR%%/06-86-05.01
 %%DATADIR%%/06-8a-01.10
+%%DATADIR%%/06-8c-01.80
+%%DATADIR%%/06-8c-02.c2
+%%DATADIR%%/06-8d-01.c2
 %%DATADIR%%/06-8e-09.10
 %%DATADIR%%/06-8e-09.c0
 %%DATADIR%%/06-8e-0a.c0
 %%DATADIR%%/06-8e-0b.d0
 %%DATADIR%%/06-8e-0c.94
+%%DATADIR%%/06-96-01.01
+%%DATADIR%%/06-9c-00.01
 %%DATADIR%%/06-9e-09.2a
 %%DATADIR%%/06-9e-0a.22
 %%DATADIR%%/06-9e-0b.02
 %%DATADIR%%/06-9e-0c.22
 %%DATADIR%%/06-9e-0d.22
 %%DATADIR%%/06-a5-02.20
 %%DATADIR%%/06-a5-03.22
 %%DATADIR%%/06-a5-05.22
 %%DATADIR%%/06-a6-00.80
 %%DATADIR%%/06-a6-01.80
+%%DATADIR%%/06-a7-01.02
 %%DATADIR%%/0f-00-07.01
 %%DATADIR%%/0f-00-07.02
 %%DATADIR%%/0f-00-0a.01
 %%DATADIR%%/0f-00-0a.02
 %%DATADIR%%/0f-00-0a.04
 %%DATADIR%%/0f-01-02.04
 %%DATADIR%%/0f-02-04.02
 %%DATADIR%%/0f-02-04.04
 %%DATADIR%%/0f-02-04.10
 %%DATADIR%%/0f-02-05.01
 %%DATADIR%%/0f-02-05.02
 %%DATADIR%%/0f-02-05.04
 %%DATADIR%%/0f-02-05.10
 %%DATADIR%%/0f-02-06.02
 %%DATADIR%%/0f-02-07.02
 %%DATADIR%%/0f-02-07.04
 %%DATADIR%%/0f-02-07.08
 %%DATADIR%%/0f-02-09.02
 %%DATADIR%%/0f-02-09.04
 %%DATADIR%%/0f-02-09.08
 %%DATADIR%%/0f-03-02.0d
 %%DATADIR%%/0f-03-03.0d
 %%DATADIR%%/0f-03-04.1d
 %%DATADIR%%/0f-04-01.02
 %%DATADIR%%/0f-04-01.bd
 %%DATADIR%%/0f-04-03.9d
 %%DATADIR%%/0f-04-04.9d
 %%DATADIR%%/0f-04-07.9d
 %%DATADIR%%/0f-04-08.01
 %%DATADIR%%/0f-04-08.02
 %%DATADIR%%/0f-04-08.5f
 %%DATADIR%%/0f-04-09.bd
 %%DATADIR%%/0f-04-0a.5c
 %%DATADIR%%/0f-04-0a.5d
 %%DATADIR%%/0f-06-02.04
 %%DATADIR%%/0f-06-04.01
 %%DATADIR%%/0f-06-04.34
 %%DATADIR%%/0f-06-05.01
 %%DATADIR%%/0f-06-08.22
 %%DATADIR%%/microcode_amd.bin
 %%DATADIR%%/microcode_amd_fam15h.bin
 %%DATADIR%%/microcode_amd_fam16h.bin
 %%DATADIR%%/microcode_amd_fam17h.bin
 /boot/firmware/intel-ucode.bin