diff --git a/mingw-w64-python/PKGBUILD b/mingw-w64-python/PKGBUILD
index c2d182f036..441948f8a7 100644
--- a/mingw-w64-python/PKGBUILD
+++ b/mingw-w64-python/PKGBUILD
@@ -22,7 +22,7 @@ else
   pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}${_pybasever}")
 fi
 pkgver=${_pybasever}.9
-pkgrel=1
+pkgrel=2
 pkgdesc="A high-level scripting language (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -361,8 +361,7 @@ build() {
     ;;
   esac
 
-  [[ -d "${srcdir}/build-${CARCH}" ]] && rm -rf "${srcdir}/build-${CARCH}"
-  mkdir -p "${srcdir}/build-${CARCH}" && cd "${srcdir}/build-${CARCH}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../Python-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -381,7 +380,7 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   # Some basic tests to ensure nothing major or MSYS2 specific features are broken
   ./python.exe "../Python-${pkgver}/mingw_smoketests.py"
@@ -389,7 +388,7 @@ check() {
 }
 
 package() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   make -j1 install DESTDIR="${pkgdir}"