diff --git a/net-im/py-python-telegram-bot/Makefile b/net-im/py-python-telegram-bot/Makefile
index 178f09767dde..ffd6a95c48f2 100644
--- a/net-im/py-python-telegram-bot/Makefile
+++ b/net-im/py-python-telegram-bot/Makefile
@@ -1,25 +1,23 @@
 PORTNAME=	python-telegram-bot
-PORTVERSION=	13.1
-PORTREVISION=	1
+PORTVERSION=	21.6
 CATEGORIES=	net-im devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=    ${PORTNAME:S/-/_/g}-${PORTVERSION}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Not just a Python wrapper around the Telegram Bot API
 WWW=		https://python-telegram-bot.org/
 
 LICENSE=	LGPL3
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}apscheduler>0:devel/py-apscheduler@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}apscheduler>0:devel/py-apscheduler@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}httpx>=0.27.0:www/py-httpx@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR}
 
 NO_ARCH=	yes
 USES=		python
-USE_PYTHON=	autoplist distutils
-PYDISTUTILS_BUILDARGS=	--with-upstream-urllib3
+USE_PYTHON=	pep517 autoplist
 
 .include <bsd.port.mk>
diff --git a/net-im/py-python-telegram-bot/distinfo b/net-im/py-python-telegram-bot/distinfo
index b14ebfd4eae2..df316b8cfb71 100644
--- a/net-im/py-python-telegram-bot/distinfo
+++ b/net-im/py-python-telegram-bot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1607090901
-SHA256 (python-telegram-bot-13.1.tar.gz) = 5feebb08ed08d7b71ceb4c05372b9f6a21d83994b5018db111509765881c8282
-SIZE (python-telegram-bot-13.1.tar.gz) = 284408
+TIMESTAMP = 1726978265
+SHA256 (python_telegram_bot-21.6.tar.gz) = 8b2b37836c3ff9c2924e990474a1c4731df21b1668acebff5099f475666426c6
+SIZE (python_telegram_bot-21.6.tar.gz) = 429768