diff --git a/multimedia/kodi-addon-inputstream.adaptive/Makefile b/multimedia/kodi-addon-inputstream.adaptive/Makefile
index c7d8613adeeb..15a5f821f4b4 100644
--- a/multimedia/kodi-addon-inputstream.adaptive/Makefile
+++ b/multimedia/kodi-addon-inputstream.adaptive/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	inputstream.adaptive
-DISTVERSION=	21.5.15
-DISTVERSIONSUFFIX=	-Omega
+DISTVERSION=	22.3.6
+DISTVERSIONSUFFIX=	-Piers
 CATEGORIES=	multimedia
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	Adaptive stream support for Kodi
-WWW=		https://github.com/peak3d/inputstream.adaptive
+WWW=		https://github.com/xbmc/inputstream.adaptive
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	googletest>0:devel/googletest \
-		rapidjson>0:devel/rapidjson
+		nlohmann-json>0:devel/nlohmann-json
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libpugixml.so:textproc/pugixml
 
 USES=		cmake compiler:c++14-lang kodi
 USE_GITHUB=	yes
-GH_ACCOUNT=	peak3d xbmc:bento4
+GH_ACCOUNT=	xbmc xbmc:bento4
 GH_PROJECT=	Bento4:bento4
-GH_TAGNAME=	1.6.0-641-3-Omega:bento4
+GH_TAGNAME=	1.6.0-641-5-Piers:bento4
 
 CMAKE_ARGS+=	-DENABLE_INTERNAL_BENTO4:BOOL=ON -DBENTO4_URL=${DISTDIR}/${DISTFILE_bento4}
 
 .include <bsd.port.mk>
diff --git a/multimedia/kodi-addon-inputstream.adaptive/distinfo b/multimedia/kodi-addon-inputstream.adaptive/distinfo
index d03d3d805b08..d86ad3bea50a 100644
--- a/multimedia/kodi-addon-inputstream.adaptive/distinfo
+++ b/multimedia/kodi-addon-inputstream.adaptive/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1753001396
-SHA256 (peak3d-inputstream.adaptive-21.5.15-Omega_GH0.tar.gz) = 40f44b1748b4d1bfe92260e2805904154b6388f96babf820bfd900b54db15d57
-SIZE (peak3d-inputstream.adaptive-21.5.15-Omega_GH0.tar.gz) = 860975
-SHA256 (xbmc-Bento4-1.6.0-641-3-Omega_GH0.tar.gz) = a9b231b63159b3a4d9e47c5328b476308852bf092ccb9ce98f7cf46a386465ce
-SIZE (xbmc-Bento4-1.6.0-641-3-Omega_GH0.tar.gz) = 5487208
+TIMESTAMP = 1769197838
+SHA256 (xbmc-inputstream.adaptive-22.3.6-Piers_GH0.tar.gz) = bb44e38e54b3ffa33027cbd7cf24d1f569263dd34e7196075aea4d037cc8869d
+SIZE (xbmc-inputstream.adaptive-22.3.6-Piers_GH0.tar.gz) = 1084329
+SHA256 (xbmc-Bento4-1.6.0-641-5-Piers_GH0.tar.gz) = 84a930e523553d638de7b2c66176e25c5910c65b906a06fb7211530df8edfc1f
+SIZE (xbmc-Bento4-1.6.0-641-5-Piers_GH0.tar.gz) = 5486856