diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index 3ab7e02..f90a32a 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1 +1 @@
-DIST spirv-headers-1.5.4.2_pre20210526.tar.gz 406038 BLAKE2B e10042a4c09668a6eb0d2f08a873794e20d83e6f7be40d58c3a59e1d96aa6845060a9fd7e90ea4e6a940eddbabf6b725be756ea64b49ef9034b34dc6c33fa5bb SHA512 ef9b171c168963a3f25643a3ce5f6a5df3b811daaf237700f793c1d313016c148b107b0d8cfe81fa4cb72f8da87a3da58387545f7bd76d15927c4742d0dc2b68
+DIST spirv-headers-1.2.198.tar.gz 416113 BLAKE2B d2f767a36830a3d1fa6289cabc5f87432473f6f3d3ab3d07b4c6a008a4917f00b3472e6ae9abf12c1a148e757d5a71f270a2ad944413ebdbefb484f498af74ce SHA512 a35167f8de66f2e16c6d2dccdd69f95c58b08abcdef5dac5a705e8e52af049ec9b0e2d0ef6fb732454a0671cd331b69bea75b24911599c0a2ce3972d40addfef
diff --git a/dev-util/spirv-headers/spirv-headers-1.5.4.2_pre20210526.ebuild b/dev-util/spirv-headers/spirv-headers-1.2.198.ebuild
similarity index 79%
rename from dev-util/spirv-headers/spirv-headers-1.5.4.2_pre20210526.ebuild
rename to dev-util/spirv-headers/spirv-headers-1.2.198.ebuild
index 6fe69b4..32f8ec7 100644
--- a/dev-util/spirv-headers/spirv-headers-1.5.4.2_pre20210526.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.2.198.ebuild
@@ -7,11 +7,11 @@
 
 DESCRIPTION="Machine-readable files for the SPIR-V Registry"
 HOMEPAGE="https://www.khronos.org/registry/spir-v/"
-EGIT_COMMIT="2e1bc6dcd4ff49ed996dc0174d1aec37c2e9ab59"
+EGIT_COMMIT="814e728b30ddd0f4509233099a3ad96fd4318c07"
 SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="*"
 
-S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
+S="${WORKDIR}/SPIRV-Headers-sdk-${PV}.0"
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index d32cb5f..202256e 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1 +1 @@
-DIST spirv-tools-2021.1.tar.gz 2613619 BLAKE2B ab5816e3407ba827f5db69cb391b0e4820661aa7367edfc5a9a41cb9fee98a7e814f765d99548cdab1a11869f79710e6243f2c97ec3ee4f6a919990dc24e63dd SHA512 74be4ecb3f6926cebdbfdc2351e3d3e0db18a8a312ce12882442d4e33737f9ccfb0ec6e1f5cd6bb5604525467605c080a8494b4aef6dd797dc805e12bc10226f
+DIST spirv-tools-2021.4.tar.gz 2887505 BLAKE2B 5e2e8662153ebe4fb5841d07a7b06faf4c344f515f1247a7f57aa0b4be7fddabe28117153547be4bb3db31485e74b70e45db4d2d2063e36aedff74076fe80551 SHA512 1eecb75e53d6ab799738d20f508fc98297e2684b9239a4a62891796e24632ddb2c910ff8535c3386199a1b18c21c1db5cb5c93a3b721574816d411c4c329ccb8
diff --git a/dev-util/spirv-tools/spirv-tools-2021.1-r1.ebuild b/dev-util/spirv-tools/spirv-tools-2021.4.ebuild
similarity index 91%
rename from dev-util/spirv-tools/spirv-tools-2021.1-r1.ebuild
rename to dev-util/spirv-tools/spirv-tools-2021.4.ebuild
index f5e7d42..c12603c 100644
--- a/dev-util/spirv-tools/spirv-tools-2021.1-r1.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2021.4.ebuild
@@ -12,10 +12,10 @@
 	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
 	inherit git-r3
 else
-	EGIT_COMMIT="c2d5375fa7cc87c93f692e7200d5d974283d4391"
+	EGIT_COMMIT="ab8eb607750208066e2d57eff6a34dbaf05f5ada"
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="*"
-	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
+	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
 DESCRIPTION="Provides an API and commands for processing SPIR-V modules"