diff --git a/textproc/py-autopep8/Makefile b/textproc/py-autopep8/Makefile
index 44b1647a11b4..36126314cf63 100644
--- a/textproc/py-autopep8/Makefile
+++ b/textproc/py-autopep8/Makefile
@@ -1,27 +1,21 @@
 PORTNAME=	autopep8
-PORTVERSION=	1.4.4
+PORTVERSION=	1.6.0
 CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Automatically formats Python code to conform to the PEP 8 style guide
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycodestyle>=2.4:devel/py-pycodestyle@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycodestyle>=2.8.0:devel/py-pycodestyle@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
-NO_ARCH=	yes
-
-OPTIONS_DEFINE=	DOCS
 
-PORTDOCS=	README.rst
-
-post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/py-autopep8/distinfo b/textproc/py-autopep8/distinfo
index 63bbf44b6184..0b5492aa534d 100644
--- a/textproc/py-autopep8/distinfo
+++ b/textproc/py-autopep8/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555317337
-SHA256 (autopep8-1.4.4.tar.gz) = 4d8eec30cc81bc5617dbf1218201d770dc35629363547f17577c61683ccfb3ee
-SIZE (autopep8-1.4.4.tar.gz) = 114796
+TIMESTAMP = 1660576956
+SHA256 (autopep8-1.6.0.tar.gz) = 44f0932855039d2c15c4510d6df665e4730f2b8582704fa48f9c55bd3e17d979
+SIZE (autopep8-1.6.0.tar.gz) = 122165