diff --git a/mingw-w64-python-flake8/PKGBUILD b/mingw-w64-python-flake8/PKGBUILD
index 003bde1dae..aadb26c64e 100644
--- a/mingw-w64-python-flake8/PKGBUILD
+++ b/mingw-w64-python-flake8/PKGBUILD
@@ -6,52 +6,51 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
 provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=5.0.4
+pkgver=6.0.0
 pkgrel=1
 pkgdesc="The modular source code checker: pep8, pyflakes and co"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
-url="https://flake8.pycqa.org/"
+url="https://github.com/pycqa/flake8"
 license=('MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-python-pyflakes"
          "${MINGW_PACKAGE_PREFIX}-python-mccabe"
          "${MINGW_PACKAGE_PREFIX}-python-pycodestyle")
-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=('2e9f8bf2bbca1ab0b7cb0bc6aee53f7e12288194a80a8be915478061fd76adb8d270ee50383b45beb9d4dd1ee806f104e7bbf29f69b23a7cd88ee0902ff3e965')
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-mock"
+              "${MINGW_PACKAGE_PREFIX}-python-pytest-runner")
+source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz")
+sha256sums=('c61007e76655af75e6785a931f452915b371dc48f56efd765247c8fe68f2b181')
 
 prepare() {
   cd "${_realname}-${pkgver}"
   # disable overly restrictive dependency pinning
-  sed -i -e 's/, *< *[0-9=.]*//' setup.py
+  sed -i -e 's|,<[0-9=.]*||' setup.cfg
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  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 ${MSYSTEM}"
   cd "${srcdir}/python-build-${MSYSTEM}"
+
   ${MINGW_PREFIX}/bin/python setup.py pytest
 }
 
 package() {
   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
 
-  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python setup.py install --root="${pkgdir}" --prefix=${MINGW_PREFIX} --optimize=1
   install -D -m644 LICENSE "${pkgdir}${MINGW_PREFIX}"/share/licenses/python-${_realname}/LICENSE
 
   for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*-script.py; do