diff --git a/dev-util/spirv-tools/spirv-tools-2021.1.ebuild b/dev-util/spirv-tools/spirv-tools-2021.1-r1.ebuild
similarity index 94%
rename from dev-util/spirv-tools/spirv-tools-2021.1.ebuild
rename to dev-util/spirv-tools/spirv-tools-2021.1-r1.ebuild
index e564c87..f5e7d42 100644
--- a/dev-util/spirv-tools/spirv-tools-2021.1.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2021.1-r1.ebuild
@@ -26,7 +26,7 @@
 # Tests fail upon finding symbols that do not match a regular expression
 # in the generated library. Easily hit with non-standard compiler flags
 RESTRICT="test"
-COMMON_DEPEND=">=dev-util/spirv-headers-1.5.4.2_pre20210526"
+COMMON_DEPEND="dev-util/spirv-headers"
 DEPEND="${COMMON_DEPEND}"
 RDEPEND=""
 BDEPEND="${PYTHON_DEPS}
diff --git a/media-libs/shaderc/shaderc-2020.6_pre20210327.ebuild b/media-libs/shaderc/shaderc-2020.6_pre20210327-r1.ebuild
similarity index 97%
rename from media-libs/shaderc/shaderc-2020.6_pre20210327.ebuild
rename to media-libs/shaderc/shaderc-2020.6_pre20210327-r1.ebuild
index f9f3d55..27e8a18 100644
--- a/media-libs/shaderc/shaderc-2020.6_pre20210327.ebuild
+++ b/media-libs/shaderc/shaderc-2020.6_pre20210327-r1.ebuild
@@ -26,7 +26,7 @@
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	>=dev-util/spirv-headers-1.5.4.2_pre20210327
+	dev-util/spirv-headers
 	doc? ( dev-ruby/asciidoctor )
 	test? (
 		dev-cpp/gtest