diff --git a/mingw-w64-spirv-headers/PKGBUILD b/mingw-w64-spirv-headers/PKGBUILD
index 2b69875462..4e1a61762a 100644
--- a/mingw-w64-spirv-headers/PKGBUILD
+++ b/mingw-w64-spirv-headers/PKGBUILD
@@ -4,8 +4,8 @@
 _realname=spirv-headers
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-epoch=1
-pkgver=1.3.250.1
+epoch=2
+pkgver=1.3.250.0.r42.g124a966
 pkgrel=1
 pkgdesc='Machine-readable files for the SPIR-V Registry (mingw-w64)'
 arch=('any')
@@ -15,22 +15,27 @@ license=('spdx:MIT')
 groups=("${MINGW_PACKAGE_PREFIX}-vulkan-devel")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-ninja")
+             "${MINGW_PACKAGE_PREFIX}-ninja"
+             "git")
 # From https://github.com/KhronosGroup/SPIRV-Tools/blob/master/DEPS
-# _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=('ce48d6655a15bdc969cf31376d93ddf3225ae5d2a55d47bdae2219a79c6e1f6f90b4eae1ab8df7309287e3dab32567559efd7bb779bb9d59651be9f5ccfd816e')
+_commit="124a9665e464ef98b8b718d572d5f329311061eb"
+source=("${_realname}"::"git+https://github.com/KhronosGroup/SPIRV-Headers#commit=${_commit}")
+  #https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags/sdk-${pkgver}/${_realname}-${pkgver}.tar.gz)
+sha256sums=('SKIP')
+
+pkgver() {
+  cd "${srcdir}/${_realname}"
+  git describe --tags ${_commit} | sed 's/sdk-//g;s/\([^-]*-g\)/r\1/;s/-/./g;s/^v//g'
+}
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake.exe \
     -G "Ninja" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-    ../SPIRV-Headers-sdk-${pkgver}
+    ../${_realname}
 
   ${MINGW_PREFIX}/bin/cmake.exe --build ./
 }
@@ -39,6 +44,6 @@ package() {
   cd ${srcdir}/build-${MSYSTEM}
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install ./
 
-  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
+  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
 }