diff --git a/extra-cmake-modules/mingw-w64/PKGBUILD b/extra-cmake-modules/mingw-w64/PKGBUILD
index 7faac5a9..6763851c 100644
--- a/extra-cmake-modules/mingw-w64/PKGBUILD
+++ b/extra-cmake-modules/mingw-w64/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mingw-w64-extra-cmake-modules
-pkgver=5.76.0
+pkgver=5.94.0
 pkgrel=1
 arch=(any)
 pkgdesc="Extra modules and scripts for CMake (mingw-w64)"
@@ -11,22 +11,12 @@ url="https://community.kde.org/Frameworks"
 source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/extra-cmake-modules-${pkgver}.tar.xz"{,.sig}
 "set-AUTOSTATICPLUGINS.patch"
 "05aa27dc0e14dab407379a4d22f895e9eff13cc0.patch")
-sha256sums=('4845e9e0a43ba15158c0cfdc7ab594e7d02692fab9083201715270a096704a32'
-            'SKIP'
-            '30bdcedab402c69ea0db3460f5a23cbd226a5cd1e12b13926b8a65df773e14a0'
-            '7e44cf56a8274c8166eaf02e60c2d34e5048992a7e3c8309b998b762a394e909')
+sha256sums=('23548a8ce2b998cfa675fc00112bf93914ee25194f0bfdf832d283c8d678d279'
+            'SKIP')
 validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure@kde.org>
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
-prepare() {
-  cd extra-cmake-modules-$pkgver
-
-  sed -e 's|/usr/bin/env python|/usr/bin/env python2|' -i find-modules/*.py
-  patch -p1 -i "${srcdir}"/set-AUTOSTATICPLUGINS.patch
-  patch -p1 -i "$srcdir"/05aa27dc0e14dab407379a4d22f895e9eff13cc0.patch
-}
-
 build() {
   cd extra-cmake-modules-$pkgver
   for _arch in ${_architectures}; do
diff --git a/kirigami2/mingw-w64/PKGBUILD b/kirigami2/mingw-w64/PKGBUILD
index 49febf90..426dace7 100644
--- a/kirigami2/mingw-w64/PKGBUILD
+++ b/kirigami2/mingw-w64/PKGBUILD
@@ -6,7 +6,7 @@
 
 _pkgname=kirigami2
 pkgname=mingw-w64-$_pkgname
-pkgver=5.76.0
+pkgver=5.94.0
 pkgrel=1
 pkgdesc="A QtQuick based components set (mingw-w64)"
 arch=('any')
@@ -15,7 +15,7 @@ license=(LGPL)
 depends=(mingw-w64-crt mingw-w64-qt5-quickcontrols mingw-w64-qt5-quickcontrols2 mingw-w64-qt5-graphicaleffects)
 makedepends=(mingw-w64-gcc mingw-w64-cmake mingw-w64-extra-cmake-modules mingw-w64-qt5-tools mingw-w64-qt5-svg kpackage)
 source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$_pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('90806125143807b74ee7f2fc74cd781d99b4e69ce5f15dcc28e1923f7a34a80a'
+sha256sums=('d7f27da3325feb339f4e1a3db78df44f05e4f505f36e15c7caeac04da0428e39'
             'SKIP')
 validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure <faure@kde.org>
 options=(!buildflags staticlibs !strip !emptydirs)
@@ -32,6 +32,10 @@ prepare() {
 build() {
   cd $_pkgname-$pkgver
   for _arch in ${_architectures}; do
+    # workaround regression in CMake files of Qt (likely introduced by my patches)
+    for m in Gui Core; do
+      export CXXFLAGS+=" -I/usr/$_arch"/include/qt/Qt$m/$($_arch-qmake-qt5 -query QT_VERSION){/Qt$m,}
+    done
     pushd "build-${_arch}"
     ${_arch}-cmake \
       -DCMAKE_BUILD_TYPE=Release \