diff --git a/textproc/py-autopep8/Makefile b/textproc/py-autopep8/Makefile
index ae61f8cde0fb..5424697d035a 100644
--- a/textproc/py-autopep8/Makefile
+++ b/textproc/py-autopep8/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	autopep8
-PORTVERSION=	2.0.0
+PORTVERSION=	2.0.1
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,12 +11,17 @@ WWW=		https://github.com/hhatto/autopep8
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycodestyle>=2.9.1:devel/py-pycodestyle@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}tomli>=0:textproc/py-tomli@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycodestyle>=2.10.0:devel/py-pycodestyle@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 31100
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tomli>=0:textproc/py-tomli@${PY_FLAVOR}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/textproc/py-autopep8/distinfo b/textproc/py-autopep8/distinfo
index a7d9718e7e2c..c61fd9c29a6d 100644
--- a/textproc/py-autopep8/distinfo
+++ b/textproc/py-autopep8/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1669058345
-SHA256 (autopep8-2.0.0.tar.gz) = 8b1659c7f003e693199f52caffdc06585bb0716900bbc6a7442fd931d658c077
-SIZE (autopep8-2.0.0.tar.gz) = 117507
+TIMESTAMP = 1674590826
+SHA256 (autopep8-2.0.1.tar.gz) = d27a8929d8dcd21c0f4b3859d2d07c6c25273727b98afc984c039df0f0d86566
+SIZE (autopep8-2.0.1.tar.gz) = 115905