diff --git a/spirv-tools/.SRCINFO b/spirv-tools/.SRCINFO
index 1069bc91f2..077db11d56 100644
--- a/spirv-tools/.SRCINFO
+++ b/spirv-tools/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = spirv-tools
 	pkgdesc = API and commands for processing SPIR-V modules
-	pkgver = 2024.2
-	pkgrel = 1.1
+	pkgver = 2024.4.rc1
+	pkgrel = 1
 	url = https://www.khronos.org/vulkan/
 	arch = x86_64
 	arch = powerpc64le
@@ -16,7 +16,7 @@ pkgbase = spirv-tools
 	makedepends = spirv-headers
 	depends = gcc-libs
 	depends = sh
-	source = spirv-tools-2024.2.tar.gz::https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/v2024.2.rc1.tar.gz
-	sha256sums = e433d40b5b4bf2bc3c819e34d7bf6194937df4d74e2f8dee8012bd8fd69e7f8a
+	source = spirv-tools-2024.4.rc1.tar.gz::https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/v2024.4.rc1.tar.gz
+	sha256sums = 7f44b9bc780a5b8c54637b722e4f9f2a2b7dd04840a79890dd4bcf615faf6b0c
 
 pkgname = spirv-tools
diff --git a/spirv-tools/.nvchecker.toml b/spirv-tools/.nvchecker.toml
new file mode 100644
index 0000000000..1add167084
--- /dev/null
+++ b/spirv-tools/.nvchecker.toml
@@ -0,0 +1,4 @@
+[spirv-tools]
+source = "git"
+git = "https://github.com/KhronosGroup/SPIRV-Tools.git"
+prefix = "v"
diff --git a/spirv-tools/PKGBUILD b/spirv-tools/PKGBUILD
index 64511ae92e..c99dd1661f 100644
--- a/spirv-tools/PKGBUILD
+++ b/spirv-tools/PKGBUILD
@@ -1,12 +1,11 @@
 # POWER Maintainer: Alexander Baldeck <alex.bldck@gmail.com>
 # Maintainer: Daurnimator <daurnimator@archlinux.org>
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
+# Maintainer: Robin Candau <antiz@archlinux.org>
 
 pkgname=spirv-tools
-pkgver=2024.2
-# There was no release tag, just the release candidate
-_tag="${pkgver}.rc1"
-pkgrel=1.1
+pkgver=2024.4.rc1
+pkgrel=1
 pkgdesc="API and commands for processing SPIR-V modules"
 arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
 url="https://www.khronos.org/vulkan/"
@@ -14,11 +13,11 @@ license=('Apache-2.0')
 groups=(vulkan-devel)
 depends=('gcc-libs' 'sh')
 makedepends=('cmake' 'python' 'ninja' 'spirv-headers')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/v${_tag}.tar.gz")
-sha256sums=('e433d40b5b4bf2bc3c819e34d7bf6194937df4d74e2f8dee8012bd8fd69e7f8a')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/v${pkgver}.tar.gz")
+sha256sums=('7f44b9bc780a5b8c54637b722e4f9f2a2b7dd04840a79890dd4bcf615faf6b0c')
 
 build() {
-  cd "SPIRV-Tools-${_tag}"
+  cd "SPIRV-Tools-${pkgver}"
 
   cmake \
       -Bbuild \
@@ -34,12 +33,13 @@ build() {
 }
 
 check() {
-  cd "SPIRV-Tools-${_tag}"
+  cd "SPIRV-Tools-${pkgver}"
+
   ninja -C build test
 }
 
 package() {
-  cd "SPIRV-Tools-${_tag}"
+  cd "SPIRV-Tools-${pkgver}"
 
   DESTDIR="${pkgdir}" cmake --install build
 }
diff --git a/spirv-tools/README.md b/spirv-tools/README.md
new file mode 100644
index 0000000000..a125a32635
--- /dev/null
+++ b/spirv-tools/README.md
@@ -0,0 +1,13 @@
+# spirv-tools
+
+## Always build against latest spirv-headers
+
+To prevent any potential build / compatibility issue, `spirv-tools` (and `lib32-spirv-tools`) should be built against the latest version of `spirv-headers` at the time.
+
+## Keep in sync with lib32-spirv-tools
+
+This package should be kept in sync with `lib32-spirv-tools` version wise. Ideally, both should be maintained as one package group (meaning they should be updated, released and moved accross repositories together).
+
+## Packaging release candidates tags
+
+It happens that stable release tags never make it to the upstream repository. Upstream was contacted a few times on that matter but it seems the release workflow still didn't got fixed reliably. While we usually do not package such "unstable" tags, the hard dependency of other packages on the latest version of spirv-tools (e.g. `glslang`) forces us to package release candidates (.rcX) tags (when the related stable tag doesn't exists).