diff --git a/packages/addons/addon-depends/dtv-scan-tables/package.mk b/packages/addons/addon-depends/dtv-scan-tables/package.mk
new file mode 100644
index 0000000000..733d5da365
--- /dev/null
+++ b/packages/addons/addon-depends/dtv-scan-tables/package.mk
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="dtv-scan-tables"
+PKG_VERSION="2022-04-30-57ed29822750"
+PKG_SHA256="6a6268aa392459378fa3a13922fc015a3fa63ff822f4b0d64d33d71350a6ec9e"
+PKG_LICENSE="GPL"
+PKG_SITE="https://git.linuxtv.org/dtv-scan-tables.git"
+PKG_URL="https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${PKG_VERSION}.tar.bz2"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="Digital TV scan tables."
+PKG_TOOLCHAIN="manual"
+PKG_BUILD_FLAGS="-sysroot"
+
+makeinstall_target() {
+  make -C share/dvb install DATADIR=${INSTALL}/usr/share
+}
diff --git a/packages/addons/addon-depends/tvh-dtv-scan-tables/package.mk b/packages/addons/addon-depends/tvh-dtv-scan-tables/package.mk
deleted file mode 100644
index a0e136f661..0000000000
--- a/packages/addons/addon-depends/tvh-dtv-scan-tables/package.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="tvh-dtv-scan-tables"
-PKG_VERSION="6bb0a70a0dcb97d5457c1ef4a7ccce634ea419b0"
-PKG_SHA256="a5f375d28e52ff3f527fecb7968f3ede6bc2e128d1ad78537ab4f0f7844edb45"
-PKG_LICENSE="GPL"
-PKG_SITE="https://github.com/tvheadend"
-PKG_URL="https://github.com/tvheadend/dtv-scan-tables/archive/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_LONGDESC="Digital TV scan tables, a fork from Tvh to support more recent tables."
-PKG_TOOLCHAIN="manual"
-PKG_BUILD_FLAGS="-sysroot"
-
-makeinstall_target() {
-  make install DATADIR=${INSTALL}/usr/share
-}
diff --git a/packages/addons/service/tvheadend42/package.mk b/packages/addons/service/tvheadend42/package.mk
index 220dd77b2a..c6bdc618d0 100644
--- a/packages/addons/service/tvheadend42/package.mk
+++ b/packages/addons/service/tvheadend42/package.mk
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="tvheadend42"
@@ -11,7 +11,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.tvheadend.org"
 PKG_URL="https://github.com/tvheadend/tvheadend/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain avahi comskip curl dvb-apps ffmpegx libdvbcsa libhdhomerun \
-                    libiconv openssl pngquant:host Python3:host tvh-dtv-scan-tables"
+                    libiconv openssl pngquant:host Python3:host dtv-scan-tables"
 PKG_DEPENDS_CONFIG="ffmpegx"
 PKG_SECTION="service"
 PKG_SHORTDESC="Tvheadend: a TV streaming server for Linux"
@@ -129,6 +129,6 @@ addon() {
 
   # dvb-scan files
   mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/dvb-scan
-  cp -r $(get_install_dir tvh-dtv-scan-tables)/usr/share/dvbv5/* \
+  cp -r $(get_install_dir dtv-scan-tables)/usr/share/dvbv5/* \
         ${ADDON_BUILD}/${PKG_ADDON_ID}/dvb-scan
 }
diff --git a/packages/addons/service/tvheadend43/package.mk b/packages/addons/service/tvheadend43/package.mk
index 4026e1c645..c1a91f419b 100644
--- a/packages/addons/service/tvheadend43/package.mk
+++ b/packages/addons/service/tvheadend43/package.mk
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="tvheadend43"
@@ -11,7 +11,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.tvheadend.org"
 PKG_URL="https://github.com/tvheadend/tvheadend/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain avahi comskip curl dvb-apps ffmpegx libdvbcsa libhdhomerun \
-                    libiconv openssl pcre2 pngquant:host Python3:host tvh-dtv-scan-tables"
+                    libiconv openssl pcre2 pngquant:host Python3:host dtv-scan-tables"
 PKG_DEPENDS_CONFIG="ffmpegx"
 PKG_SECTION="service"
 PKG_SHORTDESC="Tvheadend: a TV streaming server for Linux"
@@ -129,6 +129,6 @@ addon() {
 
   # dvb-scan files
   mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/dvb-scan
-  cp -r $(get_install_dir tvh-dtv-scan-tables)/usr/share/dvbv5/* \
+  cp -r $(get_install_dir dtv-scan-tables)/usr/share/dvbv5/* \
         ${ADDON_BUILD}/${PKG_ADDON_ID}/dvb-scan
 }