Index: graphics/drm-next-kmod/Makefile
===================================================================
--- graphics/drm-next-kmod/Makefile
+++ graphics/drm-next-kmod/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	drm-next-kmod
-PORTVERSION=	4.11.g20180224
-CATEGORIES=	graphics
+PORTVERSION=	4.11.g20180319
+CATEGORIES=	graphics kld
 
 MAINTAINER=	jmd@FreeBSD.org
 COMMENT=	DRM modules for the linuxkpi-based KMS components
@@ -14,7 +14,7 @@
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	the new KMS components are only supported on amd64
 
-RUN_DEPENDS=	gpu-firmware-kmod>=g20170403:graphics/gpu-firmware-kmod
+RUN_DEPENDS=	gpu-firmware-kmod>=g20170319:graphics/gpu-firmware-kmod
 
 CONFLICTS_INSTALL=	drm-stable-kmod
 
@@ -25,7 +25,7 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeBSDDesktop
 GH_PROJECT=	kms-drm
-GH_TAGNAME=	79764d6
+GH_TAGNAME=	4f85349
 
 .include <bsd.port.options.mk>
 
Index: graphics/drm-next-kmod/distinfo
===================================================================
--- graphics/drm-next-kmod/distinfo
+++ graphics/drm-next-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519569721
-SHA256 (FreeBSDDesktop-kms-drm-4.11.g20180224-79764d6_GH0.tar.gz) = 8a76a709a281964149993638e98210846eb5d4705668f28ac95a450b773314bb
-SIZE (FreeBSDDesktop-kms-drm-4.11.g20180224-79764d6_GH0.tar.gz) = 7358364
+TIMESTAMP = 1521512644
+SHA256 (FreeBSDDesktop-kms-drm-4.11.g20180319-4f85349_GH0.tar.gz) = 64add92f7b676541947fa808a875b2c2b1dc1582a19e16a2b22c60a6305045b9
+SIZE (FreeBSDDesktop-kms-drm-4.11.g20180319-4f85349_GH0.tar.gz) = 7357609
Index: graphics/drm-stable-kmod/Makefile
===================================================================
--- graphics/drm-stable-kmod/Makefile
+++ graphics/drm-stable-kmod/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	drm-stable-kmod
 PORTVERSION=	g20180117
-PORTREVISION=	3
-CATEGORIES=	graphics
+PORTREVISION=	4
+CATEGORIES=	graphics kld
 
 MAINTAINER=	jmd@FreeBSD.org
 COMMENT=	DRM modules for the linuxkpi-based KMS components
Index: graphics/gpu-firmware-kmod/Makefile
===================================================================
--- graphics/gpu-firmware-kmod/Makefile
+++ graphics/gpu-firmware-kmod/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	gpu-firmware-kmod
-PORTVERSION=	g20180206
+PORTVERSION=	g20180319
 PORTREVISION=	1
-CATEGORIES=	graphics
+CATEGORIES=	graphics kld
 
 MAINTAINER=	jmd@FreeBSD.org
 COMMENT=	Firmware modules for the linuxkpi-based KMS components
@@ -26,7 +26,7 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeBSDDesktop
 GH_PROJECT=	kms-firmware
-GH_TAGNAME=	dc3c90e
+GH_TAGNAME=	8b9df12
 
 .include <bsd.port.pre.mk>
 
Index: graphics/gpu-firmware-kmod/distinfo
===================================================================
--- graphics/gpu-firmware-kmod/distinfo
+++ graphics/gpu-firmware-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1517938176
-SHA256 (FreeBSDDesktop-kms-firmware-g20180206-dc3c90e_GH0.tar.gz) = c4a265f101c794f6627bf73dde5f5d90408d311789388b30d918332f7c42bf8c
-SIZE (FreeBSDDesktop-kms-firmware-g20180206-dc3c90e_GH0.tar.gz) = 11760976
+TIMESTAMP = 1521512128
+SHA256 (FreeBSDDesktop-kms-firmware-g20180319-8b9df12_GH0.tar.gz) = fa1261deb21bf6cb6fa74762a672e472c411db060749f32a4285a787686169fb
+SIZE (FreeBSDDesktop-kms-firmware-g20180319-8b9df12_GH0.tar.gz) = 11760702
Index: graphics/gpu-firmware-kmod/pkg-plist
===================================================================
--- graphics/gpu-firmware-kmod/pkg-plist
+++ graphics/gpu-firmware-kmod/pkg-plist
@@ -134,15 +134,15 @@
 /%%KMODDIR%%/amdgpu_vega10_vce_bin.ko
 /%%KMODDIR%%/i915_bxt_dmc_ver1_07_bin.ko
 /%%KMODDIR%%/i915_bxt_guc_ver8_7_bin.ko
-/%%KMODDIR%%/i915_bxt_huc_ver01_07_1398_bin.ko
+/%%KMODDIR%%/i915_bxt_huc_ver01_07_bin.ko
 /%%KMODDIR%%/i915_cnl_dmc_ver1_06_bin.ko
 /%%KMODDIR%%/i915_glk_dmc_ver1_04_bin.ko
 /%%KMODDIR%%/i915_kbl_dmc_ver1_01_bin.ko
 /%%KMODDIR%%/i915_kbl_guc_ver9_14_bin.ko
-/%%KMODDIR%%/i915_kbl_huc_ver02_00_1810_bin.ko
+/%%KMODDIR%%/i915_kbl_huc_ver02_00_bin.ko
 /%%KMODDIR%%/i915_skl_dmc_ver1_26_bin.ko
 /%%KMODDIR%%/i915_skl_guc_ver6_1_bin.ko
-/%%KMODDIR%%/i915_skl_huc_ver01_07_1398_bin.ko
+/%%KMODDIR%%/i915_skl_huc_ver01_07_bin.ko
 /%%KMODDIR%%/radeon_ARUBA_me_bin.ko
 /%%KMODDIR%%/radeon_ARUBA_pfp_bin.ko
 /%%KMODDIR%%/radeon_ARUBA_rlc_bin.ko