diff --git a/multimedia/gmmlib/Makefile b/multimedia/gmmlib/Makefile
index ce05d2844a9f..2a06471f54fb 100644
--- a/multimedia/gmmlib/Makefile
+++ b/multimedia/gmmlib/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=	gmmlib
 DISTVERSIONPREFIX=	intel-${PORTNAME}-
-DISTVERSION=	18.3.0
-PORTREVISION=	1
+DISTVERSION=	18.4.0
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/multimedia/gmmlib/distinfo b/multimedia/gmmlib/distinfo
index 22c2c093281e..451c5f29a739 100644
--- a/multimedia/gmmlib/distinfo
+++ b/multimedia/gmmlib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538161179
-SHA256 (intel-gmmlib-intel-gmmlib-18.3.0_GH0.tar.gz) = e3114d7ddd429f1b9aa43a1b1d0086d881fbf4d90e4a90ab8577c369d2e3a5e1
-SIZE (intel-gmmlib-intel-gmmlib-18.3.0_GH0.tar.gz) = 620491
+TIMESTAMP = 1544100584
+SHA256 (intel-gmmlib-intel-gmmlib-18.4.0_GH0.tar.gz) = 9af82b71029ff9b86db519c965c6e05d4b4e577564c80d32c192d9deae89e9df
+SIZE (intel-gmmlib-intel-gmmlib-18.4.0_GH0.tar.gz) = 621786
diff --git a/multimedia/gmmlib/pkg-plist b/multimedia/gmmlib/pkg-plist
index 7af92c47aaab..982ae991cc07 100644
--- a/multimedia/gmmlib/pkg-plist
+++ b/multimedia/gmmlib/pkg-plist
@@ -10,43 +10,6 @@ include/igdgmm/GmmLib/Texture/GmmTexture.h
 include/igdgmm/GmmLib/Utility/CpuSwizzleBlt/CpuSwizzleBlt.c
 include/igdgmm/GmmLib/Utility/CpuSwizzleBlt/assert.h
 include/igdgmm/GmmLib/Utility/GmmLog/GmmLog.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/async_logger.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/common.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/details/async_log_helper.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/details/async_logger_impl.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/details/file_helper.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/details/format.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/details/line_logger_fwd.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/details/line_logger_impl.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/details/log_msg.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/details/logger_impl.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/details/mpmc_bounded_q.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/details/null_mutex.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/details/os.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/details/pattern_formatter_impl.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/details/registry.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/details/spdlog_impl.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/fmt/bundled/format.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/fmt/bundled/ostream.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/fmt/bundled/printf.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/fmt/fmt.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/fmt/ostr.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/formatter.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/logger.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/sinks/android_sink.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/sinks/ansicolor_sink.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/sinks/base_sink.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/sinks/dist_sink.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/sinks/file_sinks.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/sinks/msvc_sink.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/sinks/null_sink.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/sinks/ostream_sink.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/sinks/sink.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/sinks/stdout_sinks.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/sinks/syslog_sink.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/sinks/wincolor_sink.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/spdlog.h
-include/igdgmm/GmmLib/Utility/GmmLog/spdlog/tweakme.h
 include/igdgmm/GmmLib/Utility/GmmUtility.h
 include/igdgmm/GmmLib/inc/External/Common/CachePolicy/GmmCachePolicyGen10.h
 include/igdgmm/GmmLib/inc/External/Common/CachePolicy/GmmCachePolicyGen11.h
@@ -91,6 +54,6 @@ include/igdgmm/util/g_gfxDebug.h
 include/igdgmm/util/gfxDebug.h
 lib/libgmm_umd.a
 lib/libigdgmm.so
-lib/libigdgmm.so.1
-lib/libigdgmm.so.1.0.0
+lib/libigdgmm.so.5
+lib/libigdgmm.so.5.0.0
 libdata/pkgconfig/igdgmm.pc
diff --git a/multimedia/libva-intel-media-driver/Makefile b/multimedia/libva-intel-media-driver/Makefile
index 93e86573ccf4..67d627367788 100644
--- a/multimedia/libva-intel-media-driver/Makefile
+++ b/multimedia/libva-intel-media-driver/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	media-driver
 DISTVERSIONPREFIX=	intel-media-
 DISTVERSION=	18.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	libva-intel-