diff --git a/python/900-msysize.patch b/python/900-msysize.patch
index ea523ba9..22112c7a 100644
--- a/python/900-msysize.patch
+++ b/python/900-msysize.patch
@@ -1,27 +1,5 @@
-diff -Naur Python-3.8.2-orig/config.guess Python-3.8.2/config.guess
---- Python-3.8.2-orig/config.guess	2020-02-25 00:36:25.000000000 +0300
-+++ Python-3.8.2/config.guess	2020-04-16 11:24:20.093487400 +0300
-@@ -883,6 +883,9 @@
-     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
- 	exit ;;
-+    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
-+	echo x86_64-unknown-msys
-+	exit ;;
-     prep*:SunOS:5.*:*)
- 	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
- 	exit ;;
 --- Python-3.8.7.cygwin/configure.ac	2021-05-11 21:07:52.839122100 +0200
 +++ Python-3.8.7/configure.ac	2021-05-11 21:10:48.366063600 +0200
-@@ -371,7 +371,7 @@
- 	*-*-linux*)
- 		ac_sys_system=Linux
- 		;;
--	*-*-cygwin*)
-+	*-*-cygwin*|*-*-msys*)
- 		ac_sys_system=Cygwin
- 		;;
- 	*-*-vxworks*)
 @@ -401,7 +401,7 @@
      case $MACHDEP in
  	aix*) MACHDEP="aix";;
@@ -31,15 +9,6 @@ diff -Naur Python-3.8.2-orig/config.guess Python-3.8.2/config.guess
  	darwin*) MACHDEP="darwin";;
  	'')	MACHDEP="unknown";;
      esac
-@@ -420,7 +420,7 @@
- 			_host_cpu=$host_cpu
- 		esac
- 		;;
--	*-*-cygwin*)
-+	*-*-cygwin*|*-*-msys*)
- 		_host_cpu=
- 		;;
- 	*-*-vxworks*)
 @@ -845,6 +845,14 @@
          darwin
  #elif defined(__VXWORKS__)
diff --git a/python/PKGBUILD b/python/PKGBUILD
index e454a1e0..d6b0e78c 100644
--- a/python/PKGBUILD
+++ b/python/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=python
 pkgname=('python' 'python-devel')
 pkgver=3.9.9
-pkgrel=3
+pkgrel=4
 _pybasever=${pkgver%.*}
 pkgdesc="Next generation of the python high-level scripting language"
 arch=('i686' 'x86_64')
@@ -67,7 +67,7 @@ sha256sums=('06828c04a573c073a4e51c4292a27c1be4ae26621c3edc7cf9318418ce3b6d27'
             '5b1083e9b50e149d623d863dee38ac1fb8d142f1bb78c8a01dcb09bfd97f4118'
             'fc6164a90f0ca2a9341aaf4448b4334c3393459ca5cbad6d7149f8bcf70da5fe'
             'b4042475c5c75e0b4c7c08ccad2891eb8098c066c5ba524a988a0519102e8e5d'
-            'fead37f619cb76e0fde66acdc13abee74e89c8f4797e0b21e0cca014ee2ecabe'
+            'ce55a5e343158d7b1cd114cc7d7d53bcedfcd8616c533f816b3a0f1b2fe13682'
             '85d9d042e0fa3493ec54b364e6b4fb6d2b12ba09641e01047bc84a09605ef76b'
             '17e4ac1b5f0fa8a6c410fb80d1ad99ec9185efef51b8450a31932b553c354ed1'
             'b439ff4f0a1f13858f8fb596414b74ed2c14fc3103d90287bb8e461ee89288b9'
@@ -134,11 +134,12 @@ build() {
   CPPFLAGS+=" -I/usr/include/ncursesw"
   LDFLAGS+=" -L."
 
+  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   CXX=/usr/bin/g++ \
   ./configure \
     --prefix=/usr \
-    --build=${CHOST} \
-    --host=${CHOST} \
+    --build=${CYGWIN_CHOST} \
+    --host=${CYGWIN_CHOST} \
     --enable-shared \
     --enable-ipv6 \
     --with-dbmliborder=gdbm \