diff --git a/multimedia/streamlink/Makefile b/multimedia/streamlink/Makefile
index 2eaa0653bd6b..ce48c7e3f004 100644
--- a/multimedia/streamlink/Makefile
+++ b/multimedia/streamlink/Makefile
@@ -1,45 +1,44 @@
 PORTNAME=	streamlink
-PORTVERSION=	5.5.1
+PORTVERSION=	6.1.0
 CATEGORIES=	multimedia
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	takefu@airport.fm
 COMMENT=	Command-line utility that pipes video streams
 WWW=		https://streamlink.github.io/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS}\
 		${PYTHON_PKGNAMEPREFIX}versioningit>=2.0.0:devel/py-versioningit@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}country>0:devel/py-country@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}isodate>0:devel/py-isodate@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}lxml>=4.6.4:devel/py-lxml@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pycryptodome>=3.4.3:security/py-pycryptodome@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pysocks>1.5.7:net/py-pysocks@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}requests>2.26.0:www/py-requests@${PY_FLAVOR}\
+		${PYTHON_PKGNAMEPREFIX}trio-websocket>=0.9.0:net/py-trio-websocket@${PY_FLAVOR}\
+		${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.0.0:devel/py-typing-extensions@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}websocket-client>=1.2.1:www/py-websocket-client@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}backports>0:devel/py-backports@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}flake8>0:devel/py-flake8@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}freezegun>0:devel/py-freezegun@${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-trio>0:devel/py-pytest-trio@${PY_FLAVOR}\
+		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}requests-mock>0:www/py-requests-mock@${PY_FLAVOR}
 
-USES=		python
+USES=		python:3.7+ pytest
 USE_PYTHON=	autoplist concurrent distutils
 NO_ARCH=	yes
 OPTIONS_DEFINE=		FFMPEG RTMPDUMP
 OPTIONS_DEFAULT=	FFMPEG RTMPDUMP
 FFMPEG_RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg
 RTMPDUMP_RUN_DEPENDS=	rtmpdump:multimedia/rtmpdump
 
-do-test:	.PHONY
-		cd ${WRKSRC} && ${SETENV} PYTHONPATH=${WRKSRC}/src ${PYTHON_CMD} -u -m pytest -v -ra \
-		|| ${SETENV} PYTHONPATH=${WRKSRC}/src ${PYTHON_CMD} -um unittest discover -v
-
 .include <bsd.port.mk>
diff --git a/multimedia/streamlink/distinfo b/multimedia/streamlink/distinfo
index e94873500151..10424a070334 100644
--- a/multimedia/streamlink/distinfo
+++ b/multimedia/streamlink/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1683693187
-SHA256 (streamlink-5.5.1.tar.gz) = b2b4fe8d6436dbe7bcec78de2d4bb780156388561435b61a1963156e9fc5fbd0
-SIZE (streamlink-5.5.1.tar.gz) = 536064
+TIMESTAMP = 1692793156
+SHA256 (streamlink-6.1.0.tar.gz) = 170b2027d4d8073087c58941c31aec384cbf9901fcb401f824e919ae387c4385
+SIZE (streamlink-6.1.0.tar.gz) = 686463