diff --git a/lang/intel-compute-runtime/Makefile b/lang/intel-compute-runtime/Makefile
index 1afbf29c1eeb..50e391a60429 100644
--- a/lang/intel-compute-runtime/Makefile
+++ b/lang/intel-compute-runtime/Makefile
@@ -1,61 +1,61 @@
 PORTNAME=	compute-runtime
-DISTVERSION=	21.22.19967
+DISTVERSION=	21.23.20043
 CATEGORIES=	lang
 PKGNAMEPREFIX=	intel-
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	4a926516c3ea.patch:-p1 # https://github.com/intel/compute-runtime/pull/361
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	OpenCL implementation for Intel HD 5000 (Gen8) or newer
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	Only Intel GPUs on x86 are supported
 
 LIB_DEPENDS=	libigc.so:devel/intel-graphics-compiler \
 		libigdgmm.so:multimedia/gmmlib
 
 USES=		cmake compiler:c++17-lang localbase:ldflags pkgconfig
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	intel
 CMAKE_ON=	SKIP_UNIT_TESTS SUPPORT_DG1
 CMAKE_ARGS=	-DNEO_OCL_DRIVER_VERSION:STRING="${DISTVERSIONFULL}"
 PLIST_FILES=	bin/ocloc \
 		etc/OpenCL/vendors/intel.icd \
 		include/ocloc_api.h \
 		lib/intel-opencl/libigdrcl.so \
 		lib/libocloc.so \
 		${NULL}
 
 OPTIONS_DEFINE=	VAAPI
 OPTIONS_DEFAULT=VAAPI
 OPTIONS_DEFINE_amd64=	L0
 OPTIONS_DEFAULT_amd64=	L0
 
 L0_DESC=		oneAPI Level Zero support
 L0_BUILD_DEPENDS=	level-zero>=1.0:devel/level-zero
 L0_CMAKE_BOOL=		BUILD_WITH_L0
 L0_CMAKE_ON=		-DNEO_VERSION_BUILD:STRING="0"
 L0_PLIST_FILES=		lib/libze_intel_gpu.so.1 \
 			lib/libze_intel_gpu.so.1.1.0
 
 VAAPI_BUILD_DEPENDS=	${LOCALBASE}/include/va/va.h:multimedia/libva
 VAAPI_CMAKE_BOOL_OFF=	DISABLE_LIBVA
 
 post-patch:
 	@${REINPLACE_CMD} -e '/-Werror/d' \
 		-e '/FORCE_RESPONSE_FILE/d' \
 		${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e '/OCL_ICD_VENDORDIR/s,/etc,${PREFIX}&,' \
 		${WRKSRC}/package.cmake
 
 post-install:
 # install/strip has no effect on install(FILES), so strip manually
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/intel-opencl/*.so
 
 .include <bsd.port.mk>
diff --git a/lang/intel-compute-runtime/distinfo b/lang/intel-compute-runtime/distinfo
index 996804319319..4ddb544909ab 100644
--- a/lang/intel-compute-runtime/distinfo
+++ b/lang/intel-compute-runtime/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1621885100
-SHA256 (intel-compute-runtime-21.22.19967_GH0.tar.gz) = 3b36a767f4fdac6b31cdd4b110bf92a1c785550d1bc5f229fc32858fbe9bd526
-SIZE (intel-compute-runtime-21.22.19967_GH0.tar.gz) = 3936055
+TIMESTAMP = 1622663918
+SHA256 (intel-compute-runtime-21.23.20043_GH0.tar.gz) = c863c57c2b9793e93a4ea39c0dfb6bbfe30a25dbf31490ed688b965736321dc9
+SIZE (intel-compute-runtime-21.23.20043_GH0.tar.gz) = 3959880
 SHA256 (4a926516c3ea.patch) = 1a9c4694dbe892f01a7d3be5c5229b6b3bb34222848d61054f7bdf91134ca60f
 SIZE (4a926516c3ea.patch) = 1691
diff --git a/lang/intel-compute-runtime/files/patch-unix b/lang/intel-compute-runtime/files/patch-unix
index 7fde47a37598..50467f486654 100644
--- a/lang/intel-compute-runtime/files/patch-unix
+++ b/lang/intel-compute-runtime/files/patch-unix
@@ -1,34 +1,45 @@
 Relax Linux checks for the code works on any non-Windows platform
 
 In file included from level_zero/tools/source/pin/pin.cpp:11:
 level_zero/source/inc/ze_intel_gpu.h:34:2: error: "Unsupported OS"
 #error "Unsupported OS"
  ^
 level_zero/api/core/ze_core_loader.cpp:29:41: error: use of undeclared identifier 'LOAD_INTEL_GPU_LIBRARY'
         driver_ddiTable.driverLibrary = LOAD_INTEL_GPU_LIBRARY();
                                         ^
 
 core/elf/writer.cpp:54:9: error:
       use of undeclared identifier 'memcpy_s'
         memcpy_s(data, queueFront.dataSize, queueFront.data.c_str(), queueFront.dataSize);
         ^
 core/elf/writer.cpp:59:13: error:
       use of undeclared identifier 'memcpy_s'
             memcpy_s(curString, queueFront.name.size(), queueFront.name.c_str(), queueFront.name.size());
             ^
 core/elf/writer.cpp:76:5: error:
       use of undeclared identifier 'memcpy_s'
     memcpy_s(curSectionHeader, sizeof(SElf64SectionHeader),
     ^
 
 --- shared/source/helpers/string.h.orig	2020-02-28 16:16:42 UTC
 +++ shared/source/helpers/string.h
 @@ -10,7 +10,7 @@
  #include <memory>
  #include <type_traits>
  
 -#if defined(__linux__)
 +#if !defined(_WIN32)
  
  #include <cstring>
  #include <errno.h>
+--- shared/source/os_interface/linux/drm_neo.cpp.orig	2021-06-02 19:58:38 UTC
++++ shared/source/os_interface/linux/drm_neo.cpp
+@@ -733,7 +733,7 @@ int Drm::queryAdapterBDF() {
+ void Drm::setGmmInputArgs(void *args) {
+     auto gmmInArgs = reinterpret_cast<GMM_INIT_IN_ARGS *>(args);
+     auto adapterBDF = this->getAdapterBDF();
+-#if defined(__linux__)
++#if !defined(_WIN32)
+     gmmInArgs->FileDescriptor = adapterBDF.Data;
+ #endif
+     gmmInArgs->ClientType = GMM_CLIENT::GMM_OCL_VISTA;