diff --git a/mingw-w64-cross-clang-crt/PKGBUILD b/mingw-w64-cross-clang-crt/PKGBUILD
index a793cb4b3fc..0f863d5e53e 100644
--- a/mingw-w64-cross-clang-crt/PKGBUILD
+++ b/mingw-w64-cross-clang-crt/PKGBUILD
@@ -4,7 +4,7 @@ _realname=crt
 _mingw_suff=mingw-w64-cross-clang
 pkgname=("${_mingw_suff}-${_realname}")
 conflicts=("${_mingw_suff%-*}-${_realname}")
-pkgver=9.0.0.6128.07922837
+pkgver=9.0.0.6158.1c773877
 pkgrel=1
 pkgdesc='MinGW-w64 CRT for cross-compiler'
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ groups=("${_mingw_suff}-toolchain")
 depends=("${_mingw_suff}-headers")
 makedepends=("git" "clang" "lld")
 options=('!strip' 'staticlibs' '!emptydirs' '!buildflags')
-_commit='0792283787cca8fc27dd38671107c791c87f4db3'
+_commit='1c773877f4a13c8bd7bfb8da80e1e8761a889f51'
 source=("mingw-w64"::"git+https://git.code.sf.net/p/mingw-w64/mingw-w64#commit=$_commit")
 sha256sums=('SKIP')
 
diff --git a/mingw-w64-cross-clang-headers/PKGBUILD b/mingw-w64-cross-clang-headers/PKGBUILD
index 3f50779ad0d..1811b1f49a0 100644
--- a/mingw-w64-cross-clang-headers/PKGBUILD
+++ b/mingw-w64-cross-clang-headers/PKGBUILD
@@ -5,7 +5,7 @@ _mingw_suff=mingw-w64-cross-clang
 pkgname=("${_mingw_suff}-${_realname}")
 conflicts=("${_mingw_suff%-*}-${_realname}")
 pkgdesc="MinGW-w64 headers for cross-compiler"
-pkgver=9.0.0.6128.07922837
+pkgver=9.0.0.6158.1c773877
 pkgrel=1
 arch=('i686' 'x86_64')
 url="https://mingw-w64.sourceforge.io/"
@@ -13,7 +13,7 @@ license=('custom')
 groups=("${_mingw_suff}-toolchain")
 makedepends=('git')
 options=('!strip' '!libtool' '!emptydirs' '!buildflags')
-_commit='0792283787cca8fc27dd38671107c791c87f4db3'
+_commit='1c773877f4a13c8bd7bfb8da80e1e8761a889f51'
 source=("mingw-w64"::"git+https://git.code.sf.net/p/mingw-w64/mingw-w64#commit=$_commit")
 sha256sums=('SKIP')
 
diff --git a/mingw-w64-cross-crt-git/PKGBUILD b/mingw-w64-cross-crt-git/PKGBUILD
index 67160693277..d425c1c3b1d 100644
--- a/mingw-w64-cross-crt-git/PKGBUILD
+++ b/mingw-w64-cross-crt-git/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=("${_mingw_suff}-${_realname}-git")
 replaces=("${_mingw_suff}-${_realname}")
 provides=("${_mingw_suff}-${_realname}")
 conflicts=("${_mingw_suff}-${_realname}")
-pkgver=9.0.0.6128.07922837
+pkgver=9.0.0.6158.1c773877
 pkgrel=1
 pkgdesc='MinGW-w64 CRT for cross-compiler'
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ groups=("${_mingw_suff}-toolchain" "${_mingw_suff}")
 depends=("${_mingw_suff}-headers")
 makedepends=("git" "${_mingw_suff}-gcc" "${_mingw_suff}-binutils")
 options=('!strip' 'staticlibs' '!emptydirs' '!buildflags')
-_commit='0792283787cca8fc27dd38671107c791c87f4db3'
+_commit='1c773877f4a13c8bd7bfb8da80e1e8761a889f51'
 source=("mingw-w64"::"git+https://git.code.sf.net/p/mingw-w64/mingw-w64#commit=$_commit")
 
 sha256sums=('SKIP')
diff --git a/mingw-w64-cross-headers-git/PKGBUILD b/mingw-w64-cross-headers-git/PKGBUILD
index 6a1c192f2af..f5e88d65c3f 100644
--- a/mingw-w64-cross-headers-git/PKGBUILD
+++ b/mingw-w64-cross-headers-git/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=("${_mingw_suff}-${_realname}-git")
 replaces=("${_mingw_suff}-${_realname}")
 provides=("${_mingw_suff}-${_realname}")
 conflicts=("${_mingw_suff}-${_realname}")
-pkgver=9.0.0.6128.07922837
+pkgver=9.0.0.6158.1c773877
 pkgrel=1
 pkgdesc="MinGW-w64 headers for cross-compiler"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ license=('custom')
 groups=("${_mingw_suff}-toolchain" "${_mingw_suff}")
 makedepends=('git')
 options=('!strip' '!libtool' '!emptydirs' '!buildflags')
-_commit='0792283787cca8fc27dd38671107c791c87f4db3'
+_commit='1c773877f4a13c8bd7bfb8da80e1e8761a889f51'
 source=("mingw-w64"::"git+https://git.code.sf.net/p/mingw-w64/mingw-w64#commit=$_commit")
 sha256sums=('SKIP')
 
diff --git a/mingw-w64-cross-tools-git/PKGBUILD b/mingw-w64-cross-tools-git/PKGBUILD
index 3a74abed03d..330c29fcb2c 100644
--- a/mingw-w64-cross-tools-git/PKGBUILD
+++ b/mingw-w64-cross-tools-git/PKGBUILD
@@ -8,7 +8,7 @@ replaces=("${_mingw_suff}-${_realname}")
 provides=("${_mingw_suff}-${_realname}")
 conflicts=("${_mingw_suff}-${_realname}")
 pkgdesc="MinGW-w64 headers for cross-compiler"
-pkgver=9.0.0.6128.07922837
+pkgver=9.0.0.6158.1c773877
 pkgrel=1
 arch=('i686' 'x86_64')
 url="https://mingw-w64.sourceforge.io/"
@@ -16,7 +16,7 @@ license=('custom')
 groups=("${_mingw_suff}-toolchain" "${_mingw_suff}")
 makedepends=('git')
 options=('!strip' '!libtool' '!emptydirs' '!buildflags')
-_commit='0792283787cca8fc27dd38671107c791c87f4db3'
+_commit='1c773877f4a13c8bd7bfb8da80e1e8761a889f51'
 source=("mingw-w64"::"git+https://git.code.sf.net/p/mingw-w64/mingw-w64#commit=$_commit")
 sha256sums=('SKIP')
 _tools="gendef genlib genidl genpeimg" #widl
diff --git a/mingw-w64-cross-ucrt-crt/PKGBUILD b/mingw-w64-cross-ucrt-crt/PKGBUILD
index 76c8476db25..d458e29912a 100644
--- a/mingw-w64-cross-ucrt-crt/PKGBUILD
+++ b/mingw-w64-cross-ucrt-crt/PKGBUILD
@@ -4,8 +4,8 @@ _realname=crt
 _mingw_suff=mingw-w64-cross-ucrt
 pkgname=("${_mingw_suff}-${_realname}")
 conflicts=("${_mingw_suff%-*}-${_realname}")
-pkgver=9.0.0.6128.07922837
-pkgrel=2
+pkgver=9.0.0.6158.1c773877
+pkgrel=1
 pkgdesc='MinGW-w64 CRT for cross-compiler'
 arch=('i686' 'x86_64')
 url='https://mingw-w64.sourceforge.io/'
@@ -14,7 +14,7 @@ groups=("${_mingw_suff}-toolchain")
 depends=("${_mingw_suff}-headers")
 makedepends=("git" "mingw-w64-cross-gcc" "mingw-w64-cross-binutils")
 options=('!strip' 'staticlibs' '!emptydirs' '!buildflags')
-_commit='0792283787cca8fc27dd38671107c791c87f4db3'
+_commit='1c773877f4a13c8bd7bfb8da80e1e8761a889f51'
 source=("mingw-w64"::"git+https://git.code.sf.net/p/mingw-w64/mingw-w64#commit=$_commit")
 sha256sums=('SKIP')
 
diff --git a/mingw-w64-cross-ucrt-headers/PKGBUILD b/mingw-w64-cross-ucrt-headers/PKGBUILD
index 1f3f76114ef..288a30782bb 100644
--- a/mingw-w64-cross-ucrt-headers/PKGBUILD
+++ b/mingw-w64-cross-ucrt-headers/PKGBUILD
@@ -5,15 +5,15 @@ _mingw_suff=mingw-w64-cross-ucrt
 pkgname=("${_mingw_suff}-${_realname}")
 conflicts=("${_mingw_suff%-*}-${_realname}")
 pkgdesc="MinGW-w64 headers for cross-compiler"
-pkgver=9.0.0.6128.07922837
-pkgrel=2
+pkgver=9.0.0.6158.1c773877
+pkgrel=1
 arch=('i686' 'x86_64')
 url="https://mingw-w64.sourceforge.io/"
 license=('custom')
 groups=("${_mingw_suff}-toolchain")
 makedepends=('git')
 options=('!strip' '!libtool' '!emptydirs' '!buildflags')
-_commit='0792283787cca8fc27dd38671107c791c87f4db3'
+_commit='1c773877f4a13c8bd7bfb8da80e1e8761a889f51'
 source=("mingw-w64"::"git+https://git.code.sf.net/p/mingw-w64/mingw-w64#commit=$_commit")
 sha256sums=('SKIP')
 
diff --git a/mingw-w64-cross-winpthreads-git/PKGBUILD b/mingw-w64-cross-winpthreads-git/PKGBUILD
index 9a1112936b8..e994b91827e 100644
--- a/mingw-w64-cross-winpthreads-git/PKGBUILD
+++ b/mingw-w64-cross-winpthreads-git/PKGBUILD
@@ -6,7 +6,7 @@ pkgname="${_mingw_suff}-${_realname}-git"
 replaces=("${_mingw_suff}-${_realname}")
 provides=("${_mingw_suff}-${_realname}")
 conflicts=("${_mingw_suff}-${_realname}")
-pkgver=9.0.0.6128.07922837
+pkgver=9.0.0.6158.1c773877
 pkgrel=1
 pkgdesc="MinGW-w64 winpthreads library for cross-compiler"
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ depends=("${_mingw_suff}-crt")
 optdepends=()
 backup=()
 options=('!strip' '!buildflags' 'staticlibs' '!emptydirs' '!buildflags')
-_commit='0792283787cca8fc27dd38671107c791c87f4db3'
+_commit='1c773877f4a13c8bd7bfb8da80e1e8761a889f51'
 source=("mingw-w64"::"git+https://git.code.sf.net/p/mingw-w64/mingw-w64#commit=$_commit"
         0001-Define-__-de-register_frame_info-in-fake-libgcc_s.patch)
 sha256sums=('SKIP'
diff --git a/mingw-w64-cross-winstorecompat-git/PKGBUILD b/mingw-w64-cross-winstorecompat-git/PKGBUILD
index 09423c96357..68012647b6b 100644
--- a/mingw-w64-cross-winstorecompat-git/PKGBUILD
+++ b/mingw-w64-cross-winstorecompat-git/PKGBUILD
@@ -6,7 +6,7 @@ pkgname="${_mingw_suff}-${_realname}-git"
 replaces=("${_mingw_suff}-${_realname}")
 provides=("${_mingw_suff}-${_realname}")
 conflicts=("${_mingw_suff}-${_realname}")
-pkgver=9.0.0.6128.07922837
+pkgver=9.0.0.6158.1c773877
 pkgrel=1
 pkgdesc="MinGW-w64 winRT compat library"
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ depends=("${_mingw_suff}-crt")
 optdepends=()
 backup=()
 options=('!strip' '!buildflags' 'staticlibs' '!emptydirs' '!buildflags')
-_commit='0792283787cca8fc27dd38671107c791c87f4db3'
+_commit='1c773877f4a13c8bd7bfb8da80e1e8761a889f51'
 source=("mingw-w64"::"git+https://git.code.sf.net/p/mingw-w64/mingw-w64#commit=$_commit")
 sha256sums=('SKIP')
 
diff --git a/msys2-w32api-headers/PKGBUILD b/msys2-w32api-headers/PKGBUILD
index 0f84189b452..d593bffef76 100644
--- a/msys2-w32api-headers/PKGBUILD
+++ b/msys2-w32api-headers/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgname="msys2-w32api-headers"
-pkgver=9.0.0.6128.07922837
+pkgver=9.0.0.6158.1c773877
 pkgrel=1
 pkgdesc="Win32 API headers for MSYS2 32bit toolchain"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ groups=('msys2-devel')
 depends=()
 makedepends=('git' 'mingw-w64-cross-gcc')
 options=('staticlibs' '!buildflags')
-_commit='0792283787cca8fc27dd38671107c791c87f4db3'
+_commit='1c773877f4a13c8bd7bfb8da80e1e8761a889f51'
 source=("mingw-w64"::"git+https://git.code.sf.net/p/mingw-w64/mingw-w64#commit=$_commit")
 sha256sums=('SKIP')
 
diff --git a/msys2-w32api-runtime/PKGBUILD b/msys2-w32api-runtime/PKGBUILD
index 49944df62a4..ceb2ffbd9e9 100644
--- a/msys2-w32api-runtime/PKGBUILD
+++ b/msys2-w32api-runtime/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgname="msys2-w32api-runtime"
-pkgver=9.0.0.6128.07922837
+pkgver=9.0.0.6158.1c773877
 pkgrel=1
 pkgdesc="Win32 API import libs for MSYS2 toolchain"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ groups=('msys2-devel')
 depends=('msys2-w32api-headers')
 options=('staticlibs' '!strip' '!buildflags')
 makedepends=('git' 'mingw-w64-cross-gcc')
-_commit='0792283787cca8fc27dd38671107c791c87f4db3'
+_commit='1c773877f4a13c8bd7bfb8da80e1e8761a889f51'
 source=('mingw-w64'::"git+https://git.code.sf.net/p/mingw-w64/mingw-w64#commit=$_commit")
 sha256sums=('SKIP')