diff --git a/mingw-w64-spirv-headers/PKGBUILD b/mingw-w64-spirv-headers/PKGBUILD
index 9a0f12a772..3dbd7e6bf8 100644
--- a/mingw-w64-spirv-headers/PKGBUILD
+++ b/mingw-w64-spirv-headers/PKGBUILD
@@ -4,12 +4,12 @@
 _realname=spirv-headers
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-_base_ver=1.5.4.2
-pkgver=1.5.4.2.r407.814e728
+epoch=1
+pkgver=1.3.204.1
 pkgrel=1
 pkgdesc='Machine-readable files for the SPIR-V Registry (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url='https://www.khronos.org/registry/spir-v/'
 license=('MIT')
 groups=("${MINGW_PACKAGE_PREFIX}-vulkan-devel")
@@ -17,14 +17,10 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja")
 # From https://github.com/KhronosGroup/SPIRV-Tools/blob/master/DEPS
-_commit="814e728b30ddd0f4509233099a3ad96fd4318c07"
-source=("${_realname}"::"git+https://github.com/KhronosGroup/SPIRV-Headers#commit=${_commit}")
-sha512sums=('SKIP')
-
-pkgver() {
-  cd "${srcdir}/${_realname}"
-  printf "%s.r%s.%s" "${_base_ver}" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
+# _commit="b42ba6d92faf6b4938e6f22ddd186dbdacc98d78"
+# "${_realname}"::"git+https://github.com/KhronosGroup/SPIRV-Headers#commit=${_commit}"
+source=(https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags/sdk-${pkgver}/${_realname}-${pkgver}.tar.gz)
+sha512sums=('ef994e0a5232cb21377ed39ef6a941b59eb45524f1d78092a6476245e4e0fb692780e98f5cc2176fdc2fd95430cce523fa376b0eed97042523b5f14a0586955f')
 
 build() {
   [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
@@ -34,7 +30,7 @@ build() {
   ${MINGW_PREFIX}/bin/cmake.exe \
     -G "Ninja" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-    ../${_realname}
+    ../SPIRV-Headers-sdk-${pkgver}
 
   ${MINGW_PREFIX}/bin/cmake.exe --build ./
 }
@@ -43,6 +39,6 @@ package() {
   cd ${srcdir}/build-${MINGW_CHOST}
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
 
-  install -Dm644 ${srcdir}/${_realname}/README.md ${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}/README.md
-  install -Dm644 ${srcdir}/${_realname}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE
+  install -Dm644 ${srcdir}/SPIRV-Headers-sdk-${pkgver}/README.md ${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}/README.md
+  install -Dm644 ${srcdir}/SPIRV-Headers-sdk-${pkgver}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE
 }