diff --git a/mingw-w64-python-flake8/PKGBUILD b/mingw-w64-python-flake8/PKGBUILD
index d90e88e1df..f1ac70e15d 100644
--- a/mingw-w64-python-flake8/PKGBUILD
+++ b/mingw-w64-python-flake8/PKGBUILD
@@ -1,4 +1,3 @@
-# $Id$
 # Maintainer: J. Peter Mugaas <jpmugaas@suddenlink.net>
 
 _realname=flake8
@@ -8,7 +7,7 @@ provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=4.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="The modular source code checker: pep8, pyflakes and co"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -20,34 +19,36 @@ depends=("${MINGW_PACKAGE_PREFIX}-python-pyflakes"
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
              "${MINGW_PACKAGE_PREFIX}-python-pytest-runner")
 checkdepends=("${MINGW_PACKAGE_PREFIX}-python-mock")
-source=("${_realname}-$pkgver.tar.gz"::"https://github.com/PyCQA/flake8/archive/${pkgver}.tar.gz")
-sha512sums=('6a3749b6c23bc2417351829340ec212c3305bd6a740cb77d4309296031abaa150ccff64b456e847540eb05cf635ed65025d4835d8663af6c8903491034998313')
+source=("${_realname}-$pkgver.tar.gz"::"https://github.com/PyCQA/flake8/archive/${pkgver}.tar.gz"
+        "https://patch-diff.githubusercontent.com/raw/PyCQA/flake8/pull/1542.patch")
+sha512sums=('6a3749b6c23bc2417351829340ec212c3305bd6a740cb77d4309296031abaa150ccff64b456e847540eb05cf635ed65025d4835d8663af6c8903491034998313'
+          '234fcc36e9f2faaaad9a04ca533f3bf925b01ba614aaae7d24a7f4ee08415e4f15a79986e7710cbac05de7b1a6f3fa852d169534e4a78c69f15de67251d730be')
 
 prepare() {
+  cd "${_realname}-${pkgver}"
+  patch -p1 -i "${srcdir}"/1542.patch
   # disable overly restrictive dependency pinning
-  sed -i -e 's/, *< *[0-9=.]*//' flake8-${pkgver}/setup.py
-
-  rm -rf python-build-${CARCH}| true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  sed -i -e 's/, *< *[0-9=.]*//' setup.py
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  msg "Python build for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python build for ${MSYSTEM}"
+  rm -rf python-build-${MSYSTEM}| true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" && cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  msg "Python test for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
+  msg "Python test for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py pytest
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build