diff --git a/msys2-w32api-headers/PKGBUILD b/msys2-w32api-headers/PKGBUILD
index 0fd8901e..0a4d2394 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=11.0.1.r750.g05598db99
+pkgver=12.0.0.r0.g819a6ec2e
 pkgrel=1
 pkgdesc="Win32 API headers for MSYS2 32bit toolchain"
 arch=('i686' 'x86_64')
@@ -10,10 +10,10 @@ license=('custom')
 depends=()
 makedepends=('git' 'mingw-w64-cross-gcc' 'autotools')
 options=('staticlibs' '!buildflags')
-_commit='05598db991767e79b3d701ca0979df050d82eb11'
+_commit='819a6ec2ea87c19814b287e21d65e0dc7f05abba'
 source=("mingw-w64"::"git+https://git.code.sf.net/p/mingw-w64/mingw-w64#commit=$_commit"
         "0001-Work-around-Warray-bounds-warning-for-__readfsdword-.patch")
-sha256sums=('b2ce4b2ddad1291ffad9ba06f174dd4f17d192a26c5da45bc5932b3304d6e908'
+sha256sums=('41878f44fe3b6c347fc99ab8a90d384f61bd3ae25cfb2a62a7e24d4f0d14f720'
             '189dd0f614caae1428e1d3a06bc3ac436d26afd9cbdbd1a7ce58b1ee6478ff3f')
 msys2_references=(
   'cygwin: w32api-runtime'
@@ -22,7 +22,7 @@ msys2_references=(
 
 pkgver() {
   cd "${srcdir}/mingw-w64"
-  git describe --long ${_commit} | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//g' | sed 's/11\.0\.0/11.0.1/g'
+  git describe --long ${_commit} | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//g'
 }
 
 prepare() {
diff --git a/msys2-w32api-runtime/PKGBUILD b/msys2-w32api-runtime/PKGBUILD
index c2eb0616..78f45f36 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=11.0.1.r750.g05598db99
+pkgver=12.0.0.r0.g819a6ec2e
 pkgrel=1
 pkgdesc="Win32 API import libs for MSYS2 toolchain"
 arch=('i686' 'x86_64')
@@ -10,9 +10,9 @@ license=('custom')
 depends=('msys2-w32api-headers')
 options=('staticlibs' '!strip' '!buildflags')
 makedepends=('git' 'mingw-w64-cross-gcc' 'autotools')
-_commit='05598db991767e79b3d701ca0979df050d82eb11'
+_commit='819a6ec2ea87c19814b287e21d65e0dc7f05abba'
 source=('mingw-w64'::"git+https://git.code.sf.net/p/mingw-w64/mingw-w64#commit=$_commit")
-sha256sums=('b2ce4b2ddad1291ffad9ba06f174dd4f17d192a26c5da45bc5932b3304d6e908')
+sha256sums=('41878f44fe3b6c347fc99ab8a90d384f61bd3ae25cfb2a62a7e24d4f0d14f720')
 msys2_references=(
   'cygwin: w32api-runtime'
   'cpe: cpe:/a:mingw-w64:mingw-w64'
@@ -20,7 +20,7 @@ msys2_references=(
 
 pkgver() {
   cd "${srcdir}/mingw-w64"
-  git describe --long ${_commit} | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//g' | sed 's/11\.0\.0/11.0.1/g'
+  git describe --long ${_commit} | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//g'
 }
 
 prepare() {