diff --git a/lang/intel-compute-runtime/Makefile b/lang/intel-compute-runtime/Makefile
index ebd3ab1e73e2..d997dbc39fba 100644
--- a/lang/intel-compute-runtime/Makefile
+++ b/lang/intel-compute-runtime/Makefile
@@ -1,66 +1,69 @@
 PORTNAME=	compute-runtime
-DISTVERSION=	21.37.20939
+DISTVERSION=	21.39.21127
 CATEGORIES=	lang
 PKGNAMEPREFIX=	intel-
 PKGNAMESUFFIX=	-${FLAVOR}
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	aa5a39a2db79.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.md
 
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	Only Intel GPUs on x86 are supported
+BROKEN_i386=	shared/source/kernel/implicit_args.h:35:1: error: static_assert failed \
+		due to requirement '(sizeof(NEO::ImplicitArgs) & 31) == 0' \
+		"Implicit args size need to be aligned to 32"
 
 LIB_DEPENDS=	libigc.so:devel/intel-graphics-compiler@${FLAVOR} \
 		libigdgmm.so:multimedia/gmmlib
 
 FLAVORS=	${12 11:L:S/^/llvm/}
 
 CONFLICTS_INSTALL=	${PORTNAME}-*
 
 USES=		cmake compiler:c++17-lang localbase:ldflags pkgconfig
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	intel
 CMAKE_ON=	RELEASE_WITH_REGKEYS 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.2.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 1c7b088321da..261e7986800d 100644
--- a/lang/intel-compute-runtime/distinfo
+++ b/lang/intel-compute-runtime/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1631283767
-SHA256 (intel-compute-runtime-21.37.20939_GH0.tar.gz) = 306fac63d58fd08c9ae1e5fceab8bb89c2c892c6e1579f66c4d936e5b581eb4b
-SIZE (intel-compute-runtime-21.37.20939_GH0.tar.gz) = 4576917
+TIMESTAMP = 1632493414
+SHA256 (intel-compute-runtime-21.39.21127_GH0.tar.gz) = 914623adc6a37cae3c84393dcf7ee6f6b5e23425c823398f446e9c15e7fd28fe
+SIZE (intel-compute-runtime-21.39.21127_GH0.tar.gz) = 4666632
 SHA256 (aa5a39a2db79.patch) = fc2290d950fed2bcde8fd6ce13cefb64d90ca348ae364a46a480c1d2509f67f9
 SIZE (aa5a39a2db79.patch) = 1691
diff --git a/lang/intel-compute-runtime/files/patch-arch b/lang/intel-compute-runtime/files/patch-arch
new file mode 100644
index 000000000000..4b9b30f7ef4b
--- /dev/null
+++ b/lang/intel-compute-runtime/files/patch-arch
@@ -0,0 +1,19 @@
+Add more architecture names
+
+CMake Error at CMakeLists.txt:164 (message):
+  Unsupported target processor: amd64
+  Unsupported target processor: i386
+
+--- CMakeLists.txt.orig	2021-09-17 14:06:15 UTC
++++ CMakeLists.txt
+@@ -154,6 +154,10 @@ if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+   set(NEO_TARGET_PROCESSOR "x86_64")
+ elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64")
+   set(NEO_TARGET_PROCESSOR "x86_64")
++elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "amd64")
++  set(NEO_TARGET_PROCESSOR "x86_64")
++elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386")
++  set(NEO_TARGET_PROCESSOR "x86_64") # pre-895e9e511653 code
+ elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64")
+   set(NEO_TARGET_PROCESSOR "aarch64")
+   include_directories(${CMAKE_CURRENT_SOURCE_DIR}/third_party/sse2neon)