diff --git a/multimedia/libva-intel-media-driver/Makefile b/multimedia/libva-intel-media-driver/Makefile
index 35914800c16b..22508b8ae963 100644
--- a/multimedia/libva-intel-media-driver/Makefile
+++ b/multimedia/libva-intel-media-driver/Makefile
@@ -1,59 +1,59 @@
 PORTNAME=	media-driver
 DISTVERSIONPREFIX=	intel-media-
-DISTVERSION=	21.3.5
+DISTVERSION=	21.4.0
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	libva-intel-
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	a65683be3d3a.patch:-p1 # https://github.com/intel/media-driver/pull/819
 PATCHFILES+=	9783808c766f.patch:-p1 # https://github.com/intel/media-driver/pull/819
 PATCHFILES+=	525dab01c1a2.patch:-p1 # https://github.com/intel/media-driver/pull/819
 PATCHFILES+=	d84559d09c47.patch:-p1 # https://github.com/intel/media-driver/pull/819
 PATCHFILES+=	2b730b48a7aa.patch:-p1 # https://github.com/intel/media-driver/pull/819
 PATCHFILES+=	eb2da1838a51.patch:-p1 # https://github.com/intel/media-driver/pull/819
 PATCHFILES+=	dc18089c0fb4.patch:-p1 # https://github.com/intel/media-driver/pull/819
 PATCHFILES+=	7ff0adca274b.patch:-p1 # https://github.com/intel/media-driver/pull/819
 PATCHFILES+=	217287d7ec2f.patch:-p1 # https://github.com/intel/media-driver/pull/819
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	VAAPI driver for Intel HD 5000 (Gen8) or newer
 
 LICENSE=	MIT BSD3CLAUSE
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	only Intel GPUs on x86 are supported
 
 BUILD_DEPENDS=	gmmlib>=19.3.1:multimedia/gmmlib \
 		libva>=2.7.0:multimedia/libva
 LIB_DEPENDS=	libigdgmm.so:multimedia/gmmlib \
 		libva.so:multimedia/libva
 
 USES=		cmake:testing compiler:c++11-lib localbase pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	intel
 ARCH_SUFX=	${ARCH:S/i386/32/:S/amd//:S/x86_//}
 CMAKE_OFF=	MEDIA_BUILD_FATAL_WARNINGS BUILD_CMRTLIB
 CMAKE_OFF+=	${CMAKE_TESTING_ON}
 CMAKE_TESTING_ON=	MEDIA_RUN_TEST_SUITE # XXX Unbundle googletest
 CMAKE_TESTING_TARGET=	RunULT
 CMAKE_ARGS=	-DBUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \
 		-DARCH:STRING="${ARCH_SUFX}" \
 		-DUFO_MARCH:STRING="${CPUTYPE}"
 PLIST_FILES=	lib/dri/iHD_drv_video.so
 
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=X11
 
 X11_LIB_DEPENDS=	libva-x11.so:multimedia/libva
 
 post-patch:
 	@${REINPLACE_CMD} 's/$${GIT_COMMIT}/${DISTVERSIONFULL}/' \
 		${WRKSRC}/media_driver/cmake/linux/media_compile_flags_linux.cmake
 
 post-patch-X11-off:
 	@${REINPLACE_CMD} -i .nox11 '/find_package.*X11/d' \
 		${WRKSRC}/media_driver/media_top_cmake.cmake
 
 .include <bsd.port.mk>
diff --git a/multimedia/libva-intel-media-driver/distinfo b/multimedia/libva-intel-media-driver/distinfo
index 25862063e19a..28807f2ab6b2 100644
--- a/multimedia/libva-intel-media-driver/distinfo
+++ b/multimedia/libva-intel-media-driver/distinfo
@@ -1,21 +1,21 @@
-TIMESTAMP = 1634008263
-SHA256 (intel-media-driver-intel-media-21.3.5_GH0.tar.gz) = 182925ed21c0a9843a63865e34dc35bf713294260d14ceb29e8de0de2e34733f
-SIZE (intel-media-driver-intel-media-21.3.5_GH0.tar.gz) = 23110985
+TIMESTAMP = 1633968147
+SHA256 (intel-media-driver-intel-media-21.4.0_GH0.tar.gz) = 7b9a5b72b3b66baa2efe743d7864e31b14b4f178e09bc648714dc3bd2f0c04dd
+SIZE (intel-media-driver-intel-media-21.4.0_GH0.tar.gz) = 23116624
 SHA256 (a65683be3d3a.patch) = d99421c562366497fcb9ab0a08cc15147bd6d9b3cca732fa690b6560f1adf933
 SIZE (a65683be3d3a.patch) = 1239
 SHA256 (9783808c766f.patch) = 9fca99d28508fe2431c785d79d97af3a09f2d07d80d2296bcf326e2897b1fc3c
 SIZE (9783808c766f.patch) = 1215
 SHA256 (525dab01c1a2.patch) = 0718fb1fc550f293f470cb67b5cd97d2c0aa5fa009607d973c42d6c110689cb2
 SIZE (525dab01c1a2.patch) = 2191
 SHA256 (d84559d09c47.patch) = 408115088b45d4885dcdf445d8591ca3cf6d1adc9a1b985a3a89e7dce0c2710a
 SIZE (d84559d09c47.patch) = 1925
 SHA256 (2b730b48a7aa.patch) = 021ca891be050965083599998420912f49142be28b8011259a3c6abf567e9b4f
 SIZE (2b730b48a7aa.patch) = 3417
 SHA256 (eb2da1838a51.patch) = 72f45357b578a8dce8c067898affd1664ebe9ff34167bb601d0c18f94748f46e
 SIZE (eb2da1838a51.patch) = 6397
 SHA256 (dc18089c0fb4.patch) = 87f599f3925ab774bed38e0133ef60d294cc3ff01d4f6817946de35ccd1bfb0b
 SIZE (dc18089c0fb4.patch) = 2404
 SHA256 (7ff0adca274b.patch) = d53f5e4eb28d079d34ac492ebc9b301fc4ecc6d4729049c883e6e1f4e3ecebd9
 SIZE (7ff0adca274b.patch) = 3335
 SHA256 (217287d7ec2f.patch) = dcdf77c54122b491d98c7356f8ccb1a61e78270a1bb07dceeb237c5a443732df
 SIZE (217287d7ec2f.patch) = 802