diff --git a/devel/py-flake8/Makefile b/devel/py-flake8/Makefile
index f67c156a0d8a..98ae522ca45e 100644
--- a/devel/py-flake8/Makefile
+++ b/devel/py-flake8/Makefile
@@ -1,36 +1,35 @@
 # Created by: William Grzybowski <william88@gmail.com>
 
 PORTNAME=	flake8
-PORTVERSION=	3.9.2
+PORTVERSION=	4.0.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Code checking using pep8 and pyflakes
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mccabe>=0:devel/py-mccabe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycodestyle>=0:devel/py-pycodestyle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyflakes>=0:devel/py-pyflakes@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 NO_ARCH=	yes
 TEST_ENV=	PYTHONPATH="${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}"
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 30800
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR}
 .endif
 
 do-test:
 	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-flake8/distinfo b/devel/py-flake8/distinfo
index 1e63e74ed9f0..07d35eede348 100644
--- a/devel/py-flake8/distinfo
+++ b/devel/py-flake8/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1620670360
-SHA256 (flake8-3.9.2.tar.gz) = 07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b
-SIZE (flake8-3.9.2.tar.gz) = 164777
+TIMESTAMP = 1634038293
+SHA256 (flake8-4.0.0.tar.gz) = b52d27e627676b015340c3b1c72bc9259a6cacc9341712fb8f01ddfaaa2c651a
+SIZE (flake8-4.0.0.tar.gz) = 154732
diff --git a/devel/py-flake8/files/patch-setup.cfg b/devel/py-flake8/files/patch-setup.cfg
new file mode 100644
index 000000000000..566388ecca5e
--- /dev/null
+++ b/devel/py-flake8/files/patch-setup.cfg
@@ -0,0 +1,17 @@
+--- setup.cfg.orig	2021-10-11 02:07:36 UTC
++++ setup.cfg
+@@ -35,10 +35,10 @@ packages = find:
+ package_dir = 
+ 	=src
+ install_requires = 
+-	mccabe>=0.6.0,<0.7.0
+-	pycodestyle>=2.8.0,<2.9.0
+-	pyflakes>=2.4.0,<2.5.0
+-	importlib-metadata<4.3;python_version<"3.8"
++	mccabe
++	pycodestyle
++	pyflakes
++	importlib-metadata;python_version<"3.8"
+ python_requires = >=3.6
+ 
+ [options.packages.find]