diff --git a/devel/intel-graphics-compiler/Makefile b/devel/intel-graphics-compiler/Makefile
index 7ea82934a77e..834397a833db 100644
--- a/devel/intel-graphics-compiler/Makefile
+++ b/devel/intel-graphics-compiler/Makefile
@@ -1,52 +1,53 @@
 PORTNAME=	intel-graphics-compiler
 DISTVERSIONPREFIX=	igc-
 DISTVERSION=	1.0.9389
 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+=	99edbf49d7c9.patch:-p1 # clang
 
 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}
 
 FLAVORS=	${12 11:L:S/^/llvm/}
 
 CONFLICTS_INSTALL=	${PORTNAME}-*
 
 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_OFF=	INSTALL_SPIRVDLL
 CMAKE_ARGS=	-DCMAKE_PREFIX_PATH:PATH="${LOCALBASE}/${FLAVOR}" \
 		-DIGC_OPTION__LLVM_PREFERRED_VERSION:STRING="${FLAVOR:S/llvm//}"
 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
 
 .include <bsd.port.mk>
diff --git a/devel/intel-graphics-compiler/distinfo b/devel/intel-graphics-compiler/distinfo
index 80773a109b84..c958e9ab3b76 100644
--- a/devel/intel-graphics-compiler/distinfo
+++ b/devel/intel-graphics-compiler/distinfo
@@ -1,9 +1,11 @@
 TIMESTAMP = 1636364708
 SHA256 (intel-intel-graphics-compiler-igc-1.0.9389_GH0.tar.gz) = 563a525375c25875aeb41a0fed1ebe9d1c3d67355576c73948c5305bcac93e36
 SIZE (intel-intel-graphics-compiler-igc-1.0.9389_GH0.tar.gz) = 7883556
 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 (99edbf49d7c9.patch) = c7a96b5629384422ff2d848624ac60d5cc6dffd0289bce430df1ba813a45474c
 SIZE (99edbf49d7c9.patch) = 1151
diff --git a/devel/intel-graphics-compiler/files/patch-llvm12 b/devel/intel-graphics-compiler/files/patch-llvm12
deleted file mode 100644
index 68e7995988dd..000000000000
--- a/devel/intel-graphics-compiler/files/patch-llvm12
+++ /dev/null
@@ -1,22 +0,0 @@
-CMake Error at external/llvm/llvm_deps.cmake:50 (file):
-  file COPY cannot find
-  "IGC/DEFAULT_IGC_LLVM_SOURCES_DIR-NOTFOUND/libunwind/include/mach-o/compact_unwind_encoding.h":
-  No such file or directory.
-Call Stack (most recent call first):
-  IGC/CMakeLists.txt:1250 (include)
-
---- external/llvm/llvm_deps.cmake.orig	2021-09-16 08:50:38 UTC
-+++ external/llvm/llvm_deps.cmake
-@@ -44,12 +44,6 @@ include(llvm_spirv_source_hook)
- # LLD source hook.
- if(IGC_OPTION__LLVM_LLD)
-   include(llvm_lld_source_hook)
--  if(NOT EXISTS "${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o" AND ${IGC_OPTION__LLVM_PREFERRED_VERSION} GREATER_EQUAL "12.0.0")
--    # Need to copy one header from unwind package for LLD (only for building from sources)
--    file(MAKE_DIRECTORY ${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o)
--    file(COPY ${DEFAULT_IGC_LLVM_SOURCES_DIR}/libunwind/include/mach-o/compact_unwind_encoding.h
--         DESTINATION ${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o/)
--  endif()
- endif()
- 
- # Process LLVM.