diff --git a/devel/py-stevedore/Makefile b/devel/py-stevedore/Makefile
index 282564458f4d..a0e73e23d151 100644
--- a/devel/py-stevedore/Makefile
+++ b/devel/py-stevedore/Makefile
@@ -1,27 +1,32 @@
 # Created by: Nicola Vitale <nivit@FreeBSD.org>
 
 PORTNAME=	stevedore
-PORTVERSION=	1.31.0
+PORTVERSION=	3.5.0
 CATEGORIES=	devel
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Manage dynamic plugins for Python applications
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 # pbr is a RUN_DEPENDS too, just declared elsewhere (requirements.txt)
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=234529
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=197373
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 30800
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=1.7.0:devel/py-importlib-metadata@${PY_FLAVOR}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/py-stevedore/distinfo b/devel/py-stevedore/distinfo
index 5cd87e2531bb..6be3de3c5301 100644
--- a/devel/py-stevedore/distinfo
+++ b/devel/py-stevedore/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1578509925
-SHA256 (stevedore-1.31.0.tar.gz) = e0739f9739a681c7a1fda76a102b65295e96a144ccdb552f2ae03c5f0abe8a14
-SIZE (stevedore-1.31.0.tar.gz) = 505482
+TIMESTAMP = 1642861692
+SHA256 (stevedore-3.5.0.tar.gz) = f40253887d8712eaa2bb0ea3830374416736dc8ec0e22f5a65092c1174c44335
+SIZE (stevedore-3.5.0.tar.gz) = 513548