diff --git a/www/py-hypercorn/Makefile b/www/py-hypercorn/Makefile
index 842ebd2ad028..c78d6275f4f0 100644
--- a/www/py-hypercorn/Makefile
+++ b/www/py-hypercorn/Makefile
@@ -1,47 +1,52 @@
 PORTNAME=	hypercorn
-PORTVERSION=	0.14.3
-PORTREVISION=	1
+PORTVERSION=	0.16.0
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	Hypercorn-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	ASGI Server based on Hyper libraries
-WWW=		https://github.com/pgjones/hypercorn
+COMMENT=	ASGI Server based on Hyper libraries and inspired by Gunicorn
+WWW=		https://hypercorn.readthedocs.io/en/latest/ \
+		https://github.com/pgjones/hypercorn
 
 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}h11>=0:net/py-h11@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}exceptiongroup>=1.1.0:devel/py-exceptiongroup@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}h11>=0:net/py-h11@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}h2>=3.1.0:www/py-h2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}priority>=0:www/py-priority@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wsproto>=0.14.0:net/py-wsproto@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hypothesis>=0:devel/py-hypothesis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-trio>=0:devel/py-pytest-trio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}trio>=0:net/py-trio@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist concurrent pep517
+USE_PYTHON=	autoplist concurrent pep517 pytest
 
 NO_ARCH=	yes
+TEST_ENV=	PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR}
 
 OPTIONS_DEFINE=	H3 TRIO UVLOOP
 H3_DESC=	HTTP/3 support
 TRIO_DESC=	trio worker support
 UVLOOP_DESC=	uvloop worker support
 
 H3_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}aioquic>=0.9.0<1.0:www/py-aioquic@${PY_FLAVOR}
-TRIO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}trio>=0.11.0:net/py-trio@${PY_FLAVOR}
+TRIO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}trio>=0.22.0:net/py-trio@${PY_FLAVOR}
 UVLOOP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}uvloop>=0:devel/py-uvloop@${PY_FLAVOR}
 
-do-test:
-	cd ${WRKSRC} && ${SETENV} PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR} ${PYTHON_CMD} -m pytest -rs -v
+.include <bsd.port.pre.mk>
 
-.include <bsd.port.mk>
+.if ${PYTHON_REL} < 31100
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}taskgroup>=0:devel/py-taskgroup@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tomli>=0:textproc/py-tomli@${PY_FLAVOR}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/www/py-hypercorn/distinfo b/www/py-hypercorn/distinfo
index 259734d2f15d..bc72506b7bd3 100644
--- a/www/py-hypercorn/distinfo
+++ b/www/py-hypercorn/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1662558066
-SHA256 (Hypercorn-0.14.3.tar.gz) = 4a87a0b7bbe9dc75fab06dbe4b301b9b90416e9866c23a377df21a969d6ab8dd
-SIZE (Hypercorn-0.14.3.tar.gz) = 42483
+TIMESTAMP = 1716448730
+SHA256 (hypercorn-0.16.0.tar.gz) = 3b17d1dcf4992c1f262d9f9dd799c374125d0b9a8e40e1e2d11e2938b0adfe03
+SIZE (hypercorn-0.16.0.tar.gz) = 42980