diff --git a/devel/py-asttokens/Makefile b/devel/py-asttokens/Makefile
index bb3dd58a5ebf..6e088a1e57ad 100644
--- a/devel/py-asttokens/Makefile
+++ b/devel/py-asttokens/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	asttokens
 PORTVERSION=	3.0.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,13 +13,20 @@ WWW=		https://pypi.org/project/asttokens/ \
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools-scm>=0:devel/py-setuptools-scm@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}astroid>=0:devel/py-astroid@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=44:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=3.4.3:devel/py-setuptools-scm@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}astroid>=2<4:devel/py-astroid@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils pytest
-TEST_ARGS=	--ignore=tests/testdata
+USE_PYTHON=	autoplist concurrent pep517 pytest
+
 NO_ARCH=	yes
+TEST_ARGS=	--ignore=tests/testdata
+
+OPTIONS_DEFINE=	ASTROID
+ASTROID_DESC=	Annotate trees built by astroid
+
+ASTROID_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}astroid>=2<4:devel/py-astroid@${PY_FLAVOR}
 
 .include <bsd.port.mk>