Index: head/sysutils/devcpu-data/Makefile
===================================================================
--- head/sysutils/devcpu-data/Makefile
+++ head/sysutils/devcpu-data/Makefile
@@ -2,13 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	data
-PORTVERSION=	1.13
-PORTREVISION=	2
+PORTVERSION=	1.14
 CATEGORIES=	sysutils
 MASTER_SITES=	https://downloadmirror.intel.com/27431/eng/:intel \
 		LOCAL/sbruno:amd
 PKGNAMEPREFIX=	devcpu-
-DISTFILES=	microcode-20171117.tgz:intel amd-ucode-2014-12-01.tar.bz2:amd
+DISTFILES=	microcode-20171117.tgz:intel amd64-microcode_3.20171205.1.tar.xz:amd
 
 MAINTAINER=	clarkjc@runbox.com
 COMMENT=	Intel and AMD CPUs microcode updates
Index: head/sysutils/devcpu-data/distinfo
===================================================================
--- head/sysutils/devcpu-data/distinfo
+++ head/sysutils/devcpu-data/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1515697139
+TIMESTAMP = 1515706070
 SHA256 (microcode-20171117.tgz) = 93bd1da9fa58ece0016702e657f708b7e496e56da637a3fe9a6d21f1d6f524dc
 SIZE (microcode-20171117.tgz) = 3594762
-SHA256 (amd-ucode-2014-12-01.tar.bz2) = e8f37ed12955585a625ee7cd48d89f9a04ceb2afa36081b52cc59d08a3bb8293
-SIZE (amd-ucode-2014-12-01.tar.bz2) = 20585
+SHA256 (amd64-microcode_3.20171205.1.tar.xz) = a38bc072f535a3d3c1bf4e9e545197aa5114e979e94ef7e4a67e615df2f853a7
+SIZE (amd64-microcode_3.20171205.1.tar.xz) = 32584
Index: head/sysutils/devcpu-data/files/Makefile
===================================================================
--- head/sysutils/devcpu-data/files/Makefile
+++ head/sysutils/devcpu-data/files/Makefile
@@ -1,14 +1,15 @@
-AMD_UCODE_DIR=	amd-ucode
+AMD_UCODE_DIR=	amd64-microcode-3.20171205.1
 AMD_UCODE=	$(AMD_UCODE_DIR)/microcode_amd.bin \
 		$(AMD_UCODE_DIR)/microcode_amd_fam15h.bin \
-		$(AMD_UCODE_DIR)/microcode_amd_fam16h.bin
+		$(AMD_UCODE_DIR)/microcode_amd_fam16h.bin \
+		$(AMD_UCODE_DIR)/microcode_amd_fam17h.bin
 INTEL_UCODE=	microcode.dat
 OUTPUT_DIR=	mcodes
 all:	ucode
 ucode:	ucode-tool
 	mkdir -p $(OUTPUT_DIR)
 	./ucode-tool -o $(OUTPUT_DIR) -i $(INTEL_UCODE)
-	./ucode-tool -o $(OUTPUT_DIR) -a $(AMD_UCODE)
+	mv ${AMD_UCODE} $(OUTPUT_DIR)
 
 # Use the host cc to compile ucode-tool in case of cross-compile
 ucode-tool: ucode-tool.c
Index: head/sysutils/devcpu-data/pkg-plist
===================================================================
--- head/sysutils/devcpu-data/pkg-plist
+++ head/sysutils/devcpu-data/pkg-plist
@@ -1,20 +1,4 @@
 %%DATADIR%%/2f0708.fw
-%%DATADIR%%/AMD-00001020-01000084.fw
-%%DATADIR%%/AMD-00001022-01000083.fw
-%%DATADIR%%/AMD-00001041-010000db.fw
-%%DATADIR%%/AMD-00001043-010000c8.fw
-%%DATADIR%%/AMD-00001062-010000c7.fw
-%%DATADIR%%/AMD-00001080-010000da.fw
-%%DATADIR%%/AMD-00001081-010000d9.fw
-%%DATADIR%%/AMD-000010a0-010000dc.fw
-%%DATADIR%%/AMD-00002031-02000032.fw
-%%DATADIR%%/AMD-00003010-03000027.fw
-%%DATADIR%%/AMD-00005010-05000029.fw
-%%DATADIR%%/AMD-00005020-05000119.fw
-%%DATADIR%%/AMD-00006012-0600063d.fw
-%%DATADIR%%/AMD-00006020-06000832.fw
-%%DATADIR%%/AMD-00006101-06001119.fw
-%%DATADIR%%/AMD-00007001-0700010f.fw
 %%DATADIR%%/M01106C2217.fw
 %%DATADIR%%/M01106CA107.fw
 %%DATADIR%%/M0120661104.fw
@@ -173,6 +157,10 @@
 %%DATADIR%%/med306e6_00000600.fw
 %%DATADIR%%/med306e7_0000070d.fw
 %%DATADIR%%/mef406f1_0b000021.fw
+%%DATADIR%%/microcode_amd.bin
+%%DATADIR%%/microcode_amd_fam15h.bin
+%%DATADIR%%/microcode_amd_fam16h.bin
+%%DATADIR%%/microcode_amd_fam17h.bin
 %%DATADIR%%/mu267114.fw
 %%DATADIR%%/mu267238.fw
 %%DATADIR%%/mu26732e.fw