diff --git a/textproc/py-untangle/Makefile b/textproc/py-untangle/Makefile
index 9c5da38e29bf..79ec20bcf1f2 100644
--- a/textproc/py-untangle/Makefile
+++ b/textproc/py-untangle/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	untangle
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,11 +12,14 @@ WWW=		https://github.com/stchris/untangle
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}defusedxml>=0.7.1<0.8.0:devel/py-defusedxml@${PY_FLAVOR}
 
-USES=		python
-USE_PYTHON=	autoplist concurrent distutils
+USES=		python shebangfix
+USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
+SHEBANG_FILES=	untangle.py
+
 .include <bsd.port.mk>