diff --git a/devel/intel-graphics-compiler/Makefile b/devel/intel-graphics-compiler/Makefile
index 83e81935c5e6..5beb433e66cb 100644
--- a/devel/intel-graphics-compiler/Makefile
+++ b/devel/intel-graphics-compiler/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	intel-graphics-compiler
 DISTVERSIONPREFIX=	igc-
 DISTVERSION=	1.0.8173
 PORTREVISION=	1
 CATEGORIES=	devel
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	b7f29ee948b9.patch:-p1 # https://github.com/intel/intel-graphics-compiler/pull/189
 PATCHFILES+=	a69ee09275fe.patch:-p1 # https://github.com/intel/intel-graphics-compiler/pull/189
 PATCHFILES+=	12c4fbc2b511.patch:-p1 # https://github.com/intel/intel-graphics-compiler/pull/189
 
 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-llvm11>=s20210730:devel/vc-intrinsics@llvm11
 LIB_DEPENDS=	libopencl-clang.so.11:devel/opencl-clang@llvm11
 
 USES=		bison cmake compiler:c++17-lang python:build
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	intel
-GH_TUPLE=	intel:vc-intrinsics:05d3f3d:vcintrin/../vc-intrinsics
 CMAKE_OFF=	INSTALL_SPIRVDLL
 CMAKE_ARGS=	-DCMAKE_PREFIX_PATH:PATH="${LOCALBASE}/${LIB_DEPENDS:M*@llvm*:C/.*@//}" \
 		-DIGC_OPTION__LLVM_PREFERRED_VERSION:STRING="${LIB_DEPENDS:M*@llvm*:C/.*so\.//:C/:.*//}"
 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
 # devel/llvm* have different naming from upstream under PATH
 	@${REINPLACE_CMD} -e '/clang-\$$/s//clang$$/' \
 		-e '/llvm-\$$/s//llvm$$/' \
 		${WRKSRC}/IGC/cmake/igc_find_liblldELF.cmake \
 		${WRKSRC}/IGC/cmake/igc_find_opencl_clang.cmake
 # No need to abort on every benign warning enabled by default
 	@${REINPLACE_CMD} -e 's/"-Werror"//; /-Werror/d' \
 		${WRKSRC}/IGC/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/devel/intel-graphics-compiler/distinfo b/devel/intel-graphics-compiler/distinfo
index c4a07aa66e33..6d419323ab99 100644
--- a/devel/intel-graphics-compiler/distinfo
+++ b/devel/intel-graphics-compiler/distinfo
@@ -1,11 +1,9 @@
 TIMESTAMP = 1626602428
 SHA256 (intel-intel-graphics-compiler-igc-1.0.8173_GH0.tar.gz) = 20794f1451b971c82ed824dd65723a6c562158e8061644e596b53417e9daa045
 SIZE (intel-intel-graphics-compiler-igc-1.0.8173_GH0.tar.gz) = 7471884
-SHA256 (intel-vc-intrinsics-05d3f3d_GH0.tar.gz) = 7d3df322a91ea9d95ef606b9d5a2580d6deb426f779ba921ae3a799a5e642c4f
-SIZE (intel-vc-intrinsics-05d3f3d_GH0.tar.gz) = 126560
 SHA256 (b7f29ee948b9.patch) = f47c5d7b37d4ae264eef37646afbcbaadd370ad91035895630bd52da7cf82452
 SIZE (b7f29ee948b9.patch) = 1199
 SHA256 (a69ee09275fe.patch) = e3f293844338d50e6c6d8f0213377637dc1eefc79bfd07c92e889ed8a8d8dd1f
 SIZE (a69ee09275fe.patch) = 1160
 SHA256 (12c4fbc2b511.patch) = e7570987a542f8688641b2172c87f75de0b114cde6d083f21ef27431193e648c
 SIZE (12c4fbc2b511.patch) = 4376
diff --git a/devel/intel-graphics-compiler/files/patch-system-vc-intrinsics b/devel/intel-graphics-compiler/files/patch-system-vc-intrinsics
new file mode 100644
index 000000000000..9aed7b874894
--- /dev/null
+++ b/devel/intel-graphics-compiler/files/patch-system-vc-intrinsics
@@ -0,0 +1,21 @@
+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)
+