diff --git a/devel/intel-graphics-compiler/Makefile b/devel/intel-graphics-compiler/Makefile
index 2c4b1437810d..3c592dd465d1 100644
--- a/devel/intel-graphics-compiler/Makefile
+++ b/devel/intel-graphics-compiler/Makefile
@@ -1,55 +1,57 @@
 PORTNAME=	intel-graphics-compiler
 DISTVERSIONPREFIX=	igc-
 DISTVERSION=	1.0.10395
 CATEGORIES=	devel
 PKGNAMESUFFIX=	-${FLAVOR}
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	aa7df33aebe0.patch:-p1 # https://github.com/intel/intel-graphics-compiler/pull/210
+PATCHFILES+=	35c947c2631e.patch:-p1 # https://github.com/intel/intel-graphics-compiler/issues/142
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Intel Graphics Compiler for OpenCL
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	only Intel GPUs on x86 are supported
 
 BUILD_DEPENDS=	vc-intrinsics-${FLAVOR}>=s20210730:devel/vc-intrinsics@${FLAVOR}
 LIB_DEPENDS=	libLLVM-${FLAVOR:S/llvm//}.so:devel/${FLAVOR} \
 		libopencl-clang.so.${FLAVOR:S/llvm//}:devel/opencl-clang@${FLAVOR} \
 		libLLVMSPIRVLib.so.${FLAVOR:S/llvm//}:devel/spirv-llvm-translator@${FLAVOR}
 
 FLAVORS=	${12 11:L:S/^/llvm/}
 
 CONFLICTS_INSTALL=	${PORTNAME}-llvm*
 
 USES=		bison cmake compiler:c++17-lang python:build
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	intel
 GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-123-g814e728:headers/../SPIRV-Headers \
 		KhronosGroup:SPIRV-Tools:v2021.4:tools/../SPIRV-Tools
 CMAKE_ARGS=	-DCMAKE_PREFIX_PATH:PATH="${LOCALBASE}/${FLAVOR}" \
-		-DIGC_OPTION__LLVM_PREFERRED_VERSION:STRING="${FLAVOR:S/llvm//}"
+		-DIGC_OPTION__LLVM_PREFERRED_VERSION:STRING="${FLAVOR:S/llvm//}" \
+		-DIGC_OPTION__VC_INTRINSICS_MODE:STRING=Prebuilds
 CFLAGS+=	-Wno-macro-redefined # __fastcall
 PLIST_SUB=	ARCH_SUFX=${ARCH:S/i386/32/:S/amd//:S/x86_//}
 
 post-patch:
 # lang/python* don't install unsuffixed symlinks
 	@${REINPLACE_CMD} -i .python \
 		-e '/EXECUTABLE/s/"python"/"${PYTHON_CMD:T}"/' \
 		-e '/IGC_PYTHON/s/"python"/"${PYTHON_CMD:T}"/' \
 		${WRKSRC}/IGC/CMakeLists.txt \
 		${WRKSRC}/IGC/BiFModule/linux/CMakeLists.txt
 # No need to abort on every benign warning enabled by default
 # Disable debug symbols unless WITH_DEBUG passed via CXXFLAGS
 	@${REINPLACE_CMD} -e 's/"-Werror"//; /-Werror/d' \
 		-e 's/"-g"//' \
 		${WRKSRC}/IGC/CMakeLists.txt
 # Search LLVMSPIRVLib.pc where devel/spirv-llvm-translator installs
 	@${REINPLACE_CMD} -e '/pkgconfig/s,$${_libdir},&/../libdata,' \
 		${WRKSRC}/IGC/cmake/modules/FindSPIRVLLVMTranslator.cmake
 
 .include <bsd.port.mk>
diff --git a/devel/intel-graphics-compiler/distinfo b/devel/intel-graphics-compiler/distinfo
index b593827831ab..ee91257b8635 100644
--- a/devel/intel-graphics-compiler/distinfo
+++ b/devel/intel-graphics-compiler/distinfo
@@ -1,9 +1,11 @@
 TIMESTAMP = 1644834727
 SHA256 (intel-intel-graphics-compiler-igc-1.0.10395_GH0.tar.gz) = 611b7dbee6011b79387545e70863549cc71406ee22eeeb29f340356de6e2c1ac
 SIZE (intel-intel-graphics-compiler-igc-1.0.10395_GH0.tar.gz) = 8314661
 SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-123-g814e728_GH0.tar.gz) = e4880dccda018f63cdc684afd5e51972d8ad2e3f21e9bab346a865370ea2929e
 SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-123-g814e728_GH0.tar.gz) = 416402
 SHA256 (KhronosGroup-SPIRV-Tools-v2021.4_GH0.tar.gz) = d68de260708dda785d109ff1ceeecde2d2ab71142fa5bf59061bb9f47dd3bb2c
 SIZE (KhronosGroup-SPIRV-Tools-v2021.4_GH0.tar.gz) = 2887505
 SHA256 (aa7df33aebe0.patch) = b2da1a00ac59ce7e98fd6cfb554f8974b1500bc1b9973387181414ffa4cffea5
 SIZE (aa7df33aebe0.patch) = 2242
+SHA256 (35c947c2631e.patch) = fea59a67ebba1debed6d4948139184ba8677989c1b966794ac60161936846153
+SIZE (35c947c2631e.patch) = 3354
diff --git a/devel/intel-graphics-compiler/files/patch-system-vc-intrinsics b/devel/intel-graphics-compiler/files/patch-system-vc-intrinsics
deleted file mode 100644
index 9aed7b874894..000000000000
--- a/devel/intel-graphics-compiler/files/patch-system-vc-intrinsics
+++ /dev/null
@@ -1,21 +0,0 @@
-https://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/tree/dynamic-layers/clang-layer/recipes-opencl/igc/files/link-to-LLVMGenXIntrinsics.patch
-
---- IGC/VectorCompiler/CMakeLists.txt.orig	2021-07-18 10:00:28 UTC
-+++ IGC/VectorCompiler/CMakeLists.txt
-@@ -44,6 +44,8 @@ endif()
- 
- # --- VC Intrinsics ---
- 
-+find_package(LLVMGenXIntrinsics)
-+if(NOT LLVMGenXIntrinsics_FOUND)
- if(DEFINED VC_INTRINSICS_SRC)
-   set(INTRSRC "${VC_INTRINSICS_SRC}/GenXIntrinsics")
- endif()
-@@ -58,6 +61,7 @@ set(BUILD_EXTERNAL YES)
- # We are using prebuilt SPIRV and building intrinsics.
- set(INTRBUILD "${CMAKE_CURRENT_BINARY_DIR}/intrbuild")
- add_subdirectory(${INTRSRC} ${INTRBUILD} EXCLUDE_FROM_ALL)
-+endif(NOT LLVMGenXIntrinsics_FOUND)
- 
- include(cmake/spirv.cmake)
-