diff --git a/graphics/spirv-tools/Makefile b/graphics/spirv-tools/Makefile
index 72feb39dee9b..17be8f082c30 100644
--- a/graphics/spirv-tools/Makefile
+++ b/graphics/spirv-tools/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	spirv-tools
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2021.2
+DISTVERSION=	2021.3
 CATEGORIES=	graphics
 
 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-71-g07f259e:headers/external/spirv-headers
+GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-98-g449bc98: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 892c500fd0e2..1e0c8f49290b 100644
--- a/graphics/spirv-tools/distinfo
+++ b/graphics/spirv-tools/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1624366390
-SHA256 (KhronosGroup-SPIRV-Tools-v2021.2_GH0.tar.gz) = 2416a0354a0b14b8e7b671f6f99652cc8a8a83dc9acf195dafd22fbee5e92035
-SIZE (KhronosGroup-SPIRV-Tools-v2021.2_GH0.tar.gz) = 2623612
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-71-g07f259e_GH0.tar.gz) = 1561e1442638acb5746f5d9b3537bdf31498f91a07d0902be5277a4877adacc7
-SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-71-g07f259e_GH0.tar.gz) = 412265
+TIMESTAMP = 1629900500
+SHA256 (KhronosGroup-SPIRV-Tools-v2021.3_GH0.tar.gz) = b6b4194121ee8084c62b20f8d574c32f766e4e9237dfe60b0658b316d19c6b13
+SIZE (KhronosGroup-SPIRV-Tools-v2021.3_GH0.tar.gz) = 2847869
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-98-g449bc98_GH0.tar.gz) = 6911ebf451c92c6a350b99d706cbe702a646fb3b29439f28f98502eed2d81616
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-98-g449bc98_GH0.tar.gz) = 414832
diff --git a/graphics/spirv-tools/pkg-plist b/graphics/spirv-tools/pkg-plist
index e54a5ec428f1..3bf08644c755 100644
--- a/graphics/spirv-tools/pkg-plist
+++ b/graphics/spirv-tools/pkg-plist
@@ -1,32 +1,37 @@
 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-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-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