diff --git a/devel/py-autoflake/Makefile b/devel/py-autoflake/Makefile
index 840f2f573564..9fc9499d355d 100644
--- a/devel/py-autoflake/Makefile
+++ b/devel/py-autoflake/Makefile
@@ -1,27 +1,24 @@
 PORTNAME=	autoflake
-PORTVERSION=	1.3.1
+PORTVERSION=	2.1.1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	meka@tilda.center
 COMMENT=	Removes unused imports and unused variables from Python code
 WWW=		https://github.com/PyCQA/autoflake
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyflakes>=1.1.0:devel/py-pyflakes@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
-USES=		python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
+USES=		pytest python:3.6+ shebangfix
+USE_PYTHON=	autoplist pep517
 
-TEST_ENV=	PYTHONPATH=${WRKSRC}/src
+SHEBANG_FILES=	autoflake.py test_autoflake.py
 
 NO_ARCH=	yes
 
-do-test:
-	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs -o addopts=
-
 .include <bsd.port.mk>
diff --git a/devel/py-autoflake/distinfo b/devel/py-autoflake/distinfo
index a4aea36e0574..127a3a853985 100644
--- a/devel/py-autoflake/distinfo
+++ b/devel/py-autoflake/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1584024731
-SHA256 (autoflake-1.3.1.tar.gz) = 680cb9dade101ed647488238ccb8b8bfb4369b53d58ba2c8cdf7d5d54e01f95b
-SIZE (autoflake-1.3.1.tar.gz) = 17443
+TIMESTAMP = 1683710144
+SHA256 (autoflake-2.1.1.tar.gz) = 75524b48d42d6537041d91f17573b8a98cb645642f9f05c7fcc68de10b1cade3
+SIZE (autoflake-2.1.1.tar.gz) = 26564