diff --git a/mingw-w64-crt-git/PKGBUILD b/mingw-w64-crt-git/PKGBUILD
index 2398fea04d..191b97d57b 100644
--- a/mingw-w64-crt-git/PKGBUILD
+++ b/mingw-w64-crt-git/PKGBUILD
@@ -3,9 +3,9 @@
 _realname=crt
 pkgbase=mingw-w64-${_realname}-git
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
-pkgver=10.0.0.r153.g31e6f8e5a
+pkgver=10.0.0.r157.gd295924f0
 pkgrel=1
-_commit='31e6f8e5a26d211e4f047f23736be3e9ae1d5058'
+_commit='d295924f0fb89ba8841042a419f2467cd5f97482'
 pkgdesc='MinGW-w64 CRT for Windows'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -19,7 +19,7 @@ makedepends=("git"
              "${MINGW_PACKAGE_PREFIX}-autotools")
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-options=('!strip' 'staticlibs' '!buildflags' '!emptydirs')
+options=('!strip' '!buildflags' '!emptydirs')
 source=("mingw-w64"::"git+https://git.code.sf.net/p/mingw-w64/mingw-w64#commit=$_commit"
         0001-Allow-to-use-bessel-and-complex-functions-without-un.patch
         0002-DirectX-9-fixes-for-VLC.patch)
diff --git a/mingw-w64-headers-git/PKGBUILD b/mingw-w64-headers-git/PKGBUILD
index cd585a61d2..c141776256 100644
--- a/mingw-w64-headers-git/PKGBUILD
+++ b/mingw-w64-headers-git/PKGBUILD
@@ -4,9 +4,9 @@ _realname=headers
 pkgbase=mingw-w64-${_realname}-git
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
 pkgdesc="MinGW-w64 headers for Windows"
-pkgver=10.0.0.r153.g31e6f8e5a
+pkgver=10.0.0.r157.gd295924f0
 pkgrel=2
-_commit='31e6f8e5a26d211e4f047f23736be3e9ae1d5058'
+_commit='d295924f0fb89ba8841042a419f2467cd5f97482'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://mingw-w64.sourceforge.io/"
@@ -15,7 +15,7 @@ groups=("${MINGW_PACKAGE_PREFIX}-toolchain")
 makedepends=('git' "${MINGW_PACKAGE_PREFIX}-tools" "${MINGW_PACKAGE_PREFIX}-autotools")
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-options=('!strip' '!libtool' '!emptydirs')
+options=('!strip' '!emptydirs')
 source=("mingw-w64"::"git+https://git.code.sf.net/p/mingw-w64/mingw-w64#commit=$_commit"
         0001-Allow-to-use-bessel-and-complex-functions-without-un.patch)
 sha256sums=('SKIP'
@@ -39,7 +39,7 @@ build() {
   local _default_win32_winnt
   case "${CARCH}" in
     i686|x86_64)
-      _default_win32_winnt=0x601
+      _default_win32_winnt=0x603
       ;;
     *)
       # assume any new arches added will be at least Win10
@@ -52,9 +52,9 @@ build() {
     _default_msvcrt=ucrt
   fi
 
-  msg "Configuring ${MINGW_CHOST} headers"
-  [[ -d ${srcdir}/headers-${MINGW_CHOST} ]] && rm -rf ${srcdir}/headers-${MINGW_CHOST}
-  mkdir -p ${srcdir}/headers-${MINGW_CHOST} && cd ${srcdir}/headers-${MINGW_CHOST}
+  [[ -d ${srcdir}/headers-${MSYSTEM} ]] && rm -rf ${srcdir}/headers-${MSYSTEM}
+  mkdir -p ${srcdir}/headers-${MSYSTEM} && cd ${srcdir}/headers-${MSYSTEM}
+
   ${srcdir}/mingw-w64/mingw-w64-headers/configure \
     --build=${MINGW_CHOST} \
     --host=${MINGW_CHOST} \
@@ -68,15 +68,13 @@ build() {
 }
 
 package() {
-  msg "Installing ${MINGW_CHOST} headers"
-  cd ${srcdir}/headers-${MINGW_CHOST}
+  cd ${srcdir}/headers-${MSYSTEM}
   make DESTDIR=${pkgdir} install
 
   rm ${pkgdir}${MINGW_PREFIX}/include/pthread_signal.h
   rm ${pkgdir}${MINGW_PREFIX}/include/pthread_time.h
   rm ${pkgdir}${MINGW_PREFIX}/include/pthread_unistd.h
 
-  msg "Installing MinGW-w64 licenses"
   install -Dm644 ${srcdir}/mingw-w64/mingw-w64-headers/ddk/readme.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/ddk-readme.txt
   install -Dm644 ${srcdir}/mingw-w64/COPYING ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING
   install -Dm644 ${srcdir}/mingw-w64/COPYING.MinGW-w64/COPYING.MinGW-w64.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING.MinGW-w64.txt
diff --git a/mingw-w64-libmangle-git/PKGBUILD b/mingw-w64-libmangle-git/PKGBUILD
index d2c7aed9fe..99fc7c558a 100644
--- a/mingw-w64-libmangle-git/PKGBUILD
+++ b/mingw-w64-libmangle-git/PKGBUILD
@@ -5,9 +5,9 @@ pkgbase=mingw-w64-${_realname}-git
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=10.0.0.r153.g31e6f8e5a
+pkgver=10.0.0.r157.gd295924f0
 pkgrel=1
-_commit='31e6f8e5a26d211e4f047f23736be3e9ae1d5058'
+_commit='d295924f0fb89ba8841042a419f2467cd5f97482'
 pkgdesc="MinGW-w64 libmangle"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -20,7 +20,7 @@ makedepends=("git"
              "${MINGW_PACKAGE_PREFIX}-crt-git"
              "${MINGW_PACKAGE_PREFIX}-headers-git"
              "${MINGW_PACKAGE_PREFIX}-autotools")
-options=('strip' 'staticlibs' '!emptydirs')
+options=('!emptydirs')
 source=("mingw-w64"::"git+https://git.code.sf.net/p/mingw-w64/mingw-w64#commit=$_commit")
 sha256sums=('SKIP')
 
@@ -30,8 +30,8 @@ pkgver() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   ${srcdir}/mingw-w64/mingw-w64-libraries/libmangle/configure \
     --prefix=${MINGW_PREFIX} \
@@ -42,7 +42,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build-${MINGW_CHOST}
+  cd ${srcdir}/build-${MSYSTEM}
   make DESTDIR=${pkgdir} install
   install -Dm644 ${srcdir}/mingw-w64/mingw-w64-libraries/libmangle/COPYING ${pkgdir}${MINGW_PREFIX}/share/licenses/mingw-w64-libraries/COPYING.${_realname}
 }
diff --git a/mingw-w64-tools-git/PKGBUILD b/mingw-w64-tools-git/PKGBUILD
index d78fd23e17..dd6783b7d5 100644
--- a/mingw-w64-tools-git/PKGBUILD
+++ b/mingw-w64-tools-git/PKGBUILD
@@ -6,9 +6,9 @@ pkgbase=mingw-w64-${_realname}-git
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=10.0.0.r153.g31e6f8e5a
+pkgver=10.0.0.r157.gd295924f0
 pkgrel=1
-_commit='31e6f8e5a26d211e4f047f23736be3e9ae1d5058'
+_commit='d295924f0fb89ba8841042a419f2467cd5f97482'
 pkgdesc="MinGW-w64 tools"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -17,7 +17,7 @@ license=('custom')
 groups=("${MINGW_PACKAGE_PREFIX}-toolchain")
 makedepends=("git" "${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-libmangle" "${MINGW_PACKAGE_PREFIX}-autotools")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
-options=('staticlibs' '!emptydirs')
+options=('!emptydirs')
 source=("mingw-w64"::"git+https://git.code.sf.net/p/mingw-w64/mingw-w64#commit=$_commit")
 sha256sums=('SKIP')
 _tools="gendef genlib genidl genpeimg widl" # genstubdll
@@ -27,17 +27,12 @@ pkgver() {
   git describe --long ${_commit} | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//g'
 }
 
-prepare() {
-  cd "${srcdir}/mingw-w64"
-}
-
 build() {
   local cur=
   for cur in ${_tools}; do
     plain "Building ${cur} ..."
-    [[ -d ${srcdir}/${MINGW_CHOST}-${cur} ]] && rm -rf ${srcdir}/${MINGW_CHOST}-${cur}
-    mkdir -p ${srcdir}/${MINGW_CHOST}-${cur}
-    cd ${srcdir}/${MINGW_CHOST}-${cur}
+    [[ -d ${srcdir}/${MSYSTEM}-${cur} ]] && rm -rf ${srcdir}/${MSYSTEM}-${cur}
+    mkdir -p ${srcdir}/${MSYSTEM}-${cur} && cd ${srcdir}/${MSYSTEM}-${cur}
     ${srcdir}/mingw-w64/mingw-w64-tools/${cur}/configure \
       --prefix=${MINGW_PREFIX} \
       --build=${MINGW_CHOST} \
@@ -52,7 +47,7 @@ package() {
   local cur=
   for cur in ${_tools}; do
     plain "Installing ${cur} ..."
-    cd ${srcdir}/${MINGW_CHOST}-${cur}
+    cd ${srcdir}/${MSYSTEM}-${cur}
     make DESTDIR=${pkgdir} install
     if [[ -f "${srcdir}/mingw-w64/mingw-w64-tools/${cur}"/COPYING ]]; then
       install -Dm644 ${srcdir}/mingw-w64/mingw-w64-tools/${cur}/COPYING ${pkgdir}${MINGW_PREFIX}/share/licenses/mingw-w64-tools/COPYING.${cur}
diff --git a/mingw-w64-winpthreads-git/PKGBUILD b/mingw-w64-winpthreads-git/PKGBUILD
index 101749144b..eabd71cb7d 100644
--- a/mingw-w64-winpthreads-git/PKGBUILD
+++ b/mingw-w64-winpthreads-git/PKGBUILD
@@ -5,9 +5,9 @@
 _realname=winpthreads
 pkgbase=mingw-w64-${_realname}-git
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-git" "${MINGW_PACKAGE_PREFIX}-libwinpthread-git")
-pkgver=10.0.0.r153.g31e6f8e5a
+pkgver=10.0.0.r157.gd295924f0
 pkgrel=1
-_commit='31e6f8e5a26d211e4f047f23736be3e9ae1d5058'
+_commit='d295924f0fb89ba8841042a419f2467cd5f97482'
 pkgdesc="MinGW-w64 winpthreads library"
 url="https://mingw-w64.sourceforge.io/"
 # The main license of `winpthreads' is MIT, but parts of this library are
@@ -23,7 +23,7 @@ makedepends=("git"
              "${MINGW_PACKAGE_PREFIX}-binutils"
              "${MINGW_PACKAGE_PREFIX}-crt-git"
              "${MINGW_PACKAGE_PREFIX}-headers-git")
-options=('strip' 'staticlibs' '!emptydirs' '!debug')
+options=('!emptydirs')
 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'
@@ -44,8 +44,8 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir -p "${srcdir}"/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   declare -a extra_config
   # https://github.com/msys2/MINGW-packages/issues/7043
@@ -88,7 +88,7 @@ package_winpthreads-git() {
   provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
   conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 
-  cd ${srcdir}/build-${MINGW_CHOST}
+  cd ${srcdir}/build-${MSYSTEM}
   make DESTDIR=${pkgdir} install
 
   rm -rf ${pkgdir}${MINGW_PREFIX}/bin
@@ -100,7 +100,7 @@ package_libwinpthread-git() {
   provides=("${MINGW_PACKAGE_PREFIX}-libwinpthread")
   conflicts=("${MINGW_PACKAGE_PREFIX}-libwinpthread")
 
-  cd ${srcdir}/build-${MINGW_CHOST}
+  cd ${srcdir}/build-${MSYSTEM}
   make DESTDIR=${pkgdir} install
 
   rm -rf ${pkgdir}${MINGW_PREFIX}/include
diff --git a/mingw-w64-winstorecompat-git/PKGBUILD b/mingw-w64-winstorecompat-git/PKGBUILD
index 255cb309b1..298f6a962f 100644
--- a/mingw-w64-winstorecompat-git/PKGBUILD
+++ b/mingw-w64-winstorecompat-git/PKGBUILD
@@ -3,17 +3,22 @@
 _realname=winstorecompat
 pkgbase=mingw-w64-${_realname}-git
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
-pkgver=10.0.0.r153.g31e6f8e5a
+pkgver=10.0.0.r157.gd295924f0
 pkgrel=1
-_commit='31e6f8e5a26d211e4f047f23736be3e9ae1d5058'
+_commit='d295924f0fb89ba8841042a419f2467cd5f97482'
 pkgdesc="MinGW-w64 winRT compat library"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://mingw-w64.sourceforge.io/"
 license=('custom')
 groups=("${MINGW_PACKAGE_PREFIX}-toolchain")
-makedepends=("git" "${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-binutils" "${MINGW_PACKAGE_PREFIX}-crt" "${MINGW_PACKAGE_PREFIX}-headers" "${MINGW_PACKAGE_PREFIX}-autotools")
-options=('strip' '!buildflags' 'staticlibs' '!emptydirs' '!debug')
+makedepends=("git"
+             "${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-binutils"
+             "${MINGW_PACKAGE_PREFIX}-crt"
+             "${MINGW_PACKAGE_PREFIX}-headers"
+             "${MINGW_PACKAGE_PREFIX}-autotools")
+options=('!buildflags' '!emptydirs')
 source=("mingw-w64"::"git+https://git.code.sf.net/p/mingw-w64/mingw-w64#commit=$_commit")
 sha256sums=('SKIP')
 
@@ -22,13 +27,9 @@ pkgver() {
   git describe --long ${_commit} | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//g'
 }
 
-prepare() {
-  cd "${srcdir}/mingw-w64"
-}
-
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   ${srcdir}/mingw-w64/mingw-w64-libraries/winstorecompat/configure \
     --prefix=${MINGW_PREFIX} \
@@ -40,6 +41,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build-${MINGW_CHOST}
+  cd ${srcdir}/build-${MSYSTEM}
   make DESTDIR=${pkgdir} install
 }