diff --git a/graphics/spirv-tools/Makefile b/graphics/spirv-tools/Makefile
index 5afadd88d805..441497f0e291 100644
--- a/graphics/spirv-tools/Makefile
+++ b/graphics/spirv-tools/Makefile
@@ -1,29 +1,23 @@
 PORTNAME=	spirv-tools
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2022.1
-PORTREVISION=	1
+DISTVERSION=	2022.2
 CATEGORIES=	graphics
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	a73e724359a2.patch:-p1 # https://github.com/KhronosGroup/SPIRV-Tools/pull/4683
-PATCHFILES+=	20b122b2e0d4.patch:-p1 # https://github.com/KhronosGroup/SPIRV-Tools/pull/4692
-PATCHFILES+=	b846f8f1dc2d.patch:-p1 # https://github.com/KhronosGroup/SPIRV-Tools/pull/4690
-
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Tools for processing SPIR-V intermediate shader language modules
 
 LICENSE=	APACHE20
 
 USES=		cmake compiler:c++11-lib python:3.4+,build shebangfix
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	tools/lesspipe/spirv-lesspipe.sh
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	SPIRV-Tools
-GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-137-gb42ba6d:headers/external/spirv-headers
+GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-157-g9c3fd01:headers/external/spirv-headers
 
 CMAKE_ON=	SPIRV_SKIP_TESTS
 CMAKE_OFF=	SPIRV_WERROR
 
 .include <bsd.port.mk>
diff --git a/graphics/spirv-tools/distinfo b/graphics/spirv-tools/distinfo
index 910556d92905..58f312756625 100644
--- a/graphics/spirv-tools/distinfo
+++ b/graphics/spirv-tools/distinfo
@@ -1,11 +1,5 @@
-TIMESTAMP = 1643227305
-SHA256 (KhronosGroup-SPIRV-Tools-v2022.1_GH0.tar.gz) = 844c0f590a0ab9237cec947e27cfc75bd14f39a68fc3b37d8f1b9e1b21490a58
-SIZE (KhronosGroup-SPIRV-Tools-v2022.1_GH0.tar.gz) = 2904582
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-137-gb42ba6d_GH0.tar.gz) = 44985641ced3c7973adc829714ab650e3ae49a741aad1b287a1c1904841d8a67
-SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-137-gb42ba6d_GH0.tar.gz) = 417861
-SHA256 (a73e724359a2.patch) = a1ec6ede4dd11d48a764c8056f9752c612e308c43e377b9637d2da05cf01ae9e
-SIZE (a73e724359a2.patch) = 995
-SHA256 (20b122b2e0d4.patch) = 8b878c7509ca9837ebaadd410b17319ff142a5e202735237c8e2e32bf26cf2f7
-SIZE (20b122b2e0d4.patch) = 2687
-SHA256 (b846f8f1dc2d.patch) = b296c8861fc4ad5bcae3db2774263187d208468c1ed6e587c3facf5c1db3f1d7
-SIZE (b846f8f1dc2d.patch) = 3291
+TIMESTAMP = 1649359312
+SHA256 (KhronosGroup-SPIRV-Tools-v2022.2_GH0.tar.gz) = 909fc7e68049dca611ca2d57828883a86f503b0353ff78bc594eddc65eb882b9
+SIZE (KhronosGroup-SPIRV-Tools-v2022.2_GH0.tar.gz) = 2994426
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-157-g9c3fd01_GH0.tar.gz) = c13198cac8eac8e57f94664e14ced64c53abd4d4c4a86c82b7bdd03b8044f94f
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-157-g9c3fd01_GH0.tar.gz) = 420541
diff --git a/graphics/spirv-tools/pkg-plist b/graphics/spirv-tools/pkg-plist
index 3bf08644c755..b37d754b1f4a 100644
--- a/graphics/spirv-tools/pkg-plist
+++ b/graphics/spirv-tools/pkg-plist
@@ -1,37 +1,41 @@
 bin/spirv-as
 bin/spirv-cfg
 bin/spirv-dis
 bin/spirv-lesspipe.sh
 bin/spirv-link
 bin/spirv-lint
 bin/spirv-opt
 bin/spirv-reduce
 bin/spirv-val
 include/spirv-tools/instrument.hpp
 include/spirv-tools/libspirv.h
 include/spirv-tools/libspirv.hpp
 include/spirv-tools/linker.hpp
 include/spirv-tools/optimizer.hpp
+lib/cmake/SPIRV-Tools-diff/SPIRV-Tools-diffConfig.cmake
+lib/cmake/SPIRV-Tools-diff/SPIRV-Tools-diffTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/SPIRV-Tools-diff/SPIRV-Tools-diffTargets.cmake
 lib/cmake/SPIRV-Tools-link/SPIRV-Tools-linkConfig.cmake
 lib/cmake/SPIRV-Tools-link/SPIRV-Tools-linkTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/SPIRV-Tools-link/SPIRV-Tools-linkTargets.cmake
 lib/cmake/SPIRV-Tools-lint/SPIRV-Tools-lintConfig.cmake
 lib/cmake/SPIRV-Tools-lint/SPIRV-Tools-lintTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/SPIRV-Tools-lint/SPIRV-Tools-lintTargets.cmake
 lib/cmake/SPIRV-Tools-opt/SPIRV-Tools-optConfig.cmake
 lib/cmake/SPIRV-Tools-opt/SPIRV-Tools-optTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake
 lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceConfig.cmake
 lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceTarget-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceTarget.cmake
 lib/cmake/SPIRV-Tools/SPIRV-ToolsConfig.cmake
 lib/cmake/SPIRV-Tools/SPIRV-ToolsTarget-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake
+lib/libSPIRV-Tools-diff.a
 lib/libSPIRV-Tools-link.a
 lib/libSPIRV-Tools-lint.a
 lib/libSPIRV-Tools-opt.a
 lib/libSPIRV-Tools-reduce.a
 lib/libSPIRV-Tools-shared.so
 lib/libSPIRV-Tools.a
 libdata/pkgconfig/SPIRV-Tools-shared.pc
 libdata/pkgconfig/SPIRV-Tools.pc