diff --git a/devel/py-flake8/Makefile b/devel/py-flake8/Makefile
index 04a900af9edb..4dcb678c7915 100644
--- a/devel/py-flake8/Makefile
+++ b/devel/py-flake8/Makefile
@@ -1,25 +1,27 @@
 PORTNAME=	flake8
-PORTVERSION=	5.0.4
+PORTVERSION=	6.0.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Code checking using pep8 and pyflakes
 WWW=		https://pypi.org/project/flake8/ \
-		https://gitlab.com/pycqa/flake8
+		https://github.com/PyCQA/flake8
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 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}mock>=0:devel/py-mock@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent distutils pytest
 NO_ARCH=	yes
+# test_up_to_date is broken because pypi tarball lacks required files
+# upstream is uncooperative about fixing this
 PYTEST_BROKEN_TESTS=	test_up_to_date test_all_pyflakes_messages_have_flake8_codes_assigned
 
 .include <bsd.port.mk>
diff --git a/devel/py-flake8/distinfo b/devel/py-flake8/distinfo
index 68748d15a294..6bd62b3affa3 100644
--- a/devel/py-flake8/distinfo
+++ b/devel/py-flake8/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1659614031
-SHA256 (flake8-5.0.4.tar.gz) = 6fbe320aad8d6b95cec8b8e47bc933004678dc63095be98528b7bdd2a9f510db
-SIZE (flake8-5.0.4.tar.gz) = 145862
+TIMESTAMP = 1669294573
+SHA256 (flake8-6.0.0.tar.gz) = c61007e76655af75e6785a931f452915b371dc48f56efd765247c8fe68f2b181
+SIZE (flake8-6.0.0.tar.gz) = 138524
diff --git a/devel/py-flake8/files/patch-setup.cfg b/devel/py-flake8/files/patch-setup.cfg
index 60fd3a1a28f3..f226afa2aee5 100644
--- a/devel/py-flake8/files/patch-setup.cfg
+++ b/devel/py-flake8/files/patch-setup.cfg
@@ -1,17 +1,15 @@
---- setup.cfg.orig	2022-08-03 23:21:09 UTC
-+++ setup.cfg
-@@ -35,10 +35,10 @@ packages = find:
+--- setup.cfg.orig	2022-11-23 22:27:42.662058600 +0300
++++ setup.cfg	2022-11-24 16:01:07.666654000 +0300
+@@ -30,9 +30,9 @@
  package_dir = 
  	=src
  install_requires = 
 -	mccabe>=0.7.0,<0.8.0
--	pycodestyle>=2.9.0,<2.10.0
--	pyflakes>=2.5.0,<2.6.0
--	importlib-metadata>=1.1.0,<4.3;python_version<"3.8"
+-	pycodestyle>=2.10.0,<2.11.0
+-	pyflakes>=3.0.0,<3.1.0
 +	mccabe
 +	pycodestyle
 +	pyflakes
-+	importlib-metadata;python_version<"3.8"
- python_requires = >=3.6.1
+ python_requires = >=3.8.1
  
  [options.packages.find]