diff -urN multimedia/kodi-addon-pvr-hts/Makefile multimedia/kodi-addon-pvr-hts/Makefile
--- multimedia/kodi-addon-pvr-hts/Makefile	2020-09-16 04:00:11.056885000 +0800
+++ multimedia/kodi-addon-pvr-hts/Makefile	2020-08-18 15:45:56.194766000 +0800
@@ -3,7 +3,6 @@
 
 PORTNAME=	kodi-addon-pvr-hts
 PORTVERSION=	4.4.21
-DISTVERSIONSUFFIX=	-Leia
 CATEGORIES=	multimedia
 
 MAINTAINER=	decke@FreeBSD.org
@@ -21,5 +20,9 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	kodi-pvr
 GH_PROJECT=	pvr.hts
+GH_TAGNAME=	${PORTVERSION}-Leia
+
+.include "${CURDIR}../../multimedia/kodi/version.mk"
+PLIST_SUB=	KODI_VERSION=${KODI_VERSION}
 
 .include <bsd.port.mk>
diff -urN multimedia/kodi-addon-pvr-hts/distinfo multimedia/kodi-addon-pvr-hts/distinfo
--- multimedia/kodi-addon-pvr-hts/distinfo	2020-09-16 04:00:11.056990000 +0800
+++ multimedia/kodi-addon-pvr-hts/distinfo	2020-08-17 10:24:18.474398000 +0800
@@ -1,3 +1,3 @@
-TIMESTAMP = 1600161538
-SHA256 (kodi-pvr-pvr.hts-4.4.21-Leia_GH0.tar.gz) = 6958b91ca616554e4c068bc303c66388e9a2c3a68b5979d8918b4e0d7b6bb95c
-SIZE (kodi-pvr-pvr.hts-4.4.21-Leia_GH0.tar.gz) = 162110
+TIMESTAMP = 1594907952
+SHA256 (kodi-pvr-pvr.hts-4.4.21-4.4.21-Leia_GH0.tar.gz) = 6958b91ca616554e4c068bc303c66388e9a2c3a68b5979d8918b4e0d7b6bb95c
+SIZE (kodi-pvr-pvr.hts-4.4.21-4.4.21-Leia_GH0.tar.gz) = 162110
diff -urN multimedia/kodi-addon-pvr-hts/pkg-plist multimedia/kodi-addon-pvr-hts/pkg-plist
--- multimedia/kodi-addon-pvr-hts/pkg-plist	2020-07-19 13:40:42.366547000 +0800
+++ multimedia/kodi-addon-pvr-hts/pkg-plist	2020-08-18 15:46:08.671649000 +0800
@@ -1,5 +1,5 @@
 lib/kodi/addons/pvr.hts/pvr.hts.so
-lib/kodi/addons/pvr.hts/pvr.hts.so.18.7
+lib/kodi/addons/pvr.hts/pvr.hts.so.%%KODI_VERSION%%
 lib/kodi/addons/pvr.hts/pvr.hts.so.4.4.21
 share/kodi/addons/pvr.hts/addon.xml
 share/kodi/addons/pvr.hts/changelog.txt