diff --git a/packages/addons/addon-depends/argtable2/package.mk b/packages/addons/addon-depends/argtable2/package.mk
index 5a41df55fb..37c65723f8 100644
--- a/packages/addons/addon-depends/argtable2/package.mk
+++ b/packages/addons/addon-depends/argtable2/package.mk
@@ -9,7 +9,7 @@ PKG_SITE="http://argtable.sourceforge.net/"
 PKG_URL="https://downloads.sourceforge.net/project/argtable/argtable/argtable-${PKG_VERSION}/argtable2-${PKG_VERSION:2:4}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Argtable is an open source ANSI C library that parses GNU-style command-line options."
+PKG_TOOLCHAIN="configure"
+PKG_BUILD_FLAGS="-sysroot"
 
-make_target() {
-  :
-}
+PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
diff --git a/packages/addons/addon-depends/comskip/package.mk b/packages/addons/addon-depends/comskip/package.mk
index 2f76219895..ead8c25bf1 100644
--- a/packages/addons/addon-depends/comskip/package.mk
+++ b/packages/addons/addon-depends/comskip/package.mk
@@ -8,21 +8,13 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.kaashoek.com/comskip/"
 PKG_URL="https://github.com/erikkaashoek/Comskip/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain argtable2 ffmpegx"
+PKG_DEPENDS_CONFIG="argtable2 ffmpegx"
 PKG_LONGDESC="Comskip detects commercial breaks from a video stream. It can be used for post-processing recordings."
 PKG_TOOLCHAIN="autotools"
+PKG_BUILD_FLAGS="-sysroot"
 
 pre_configure_target() {
-  LDFLAGS+=" -ldl"
-
-  export argtable2_CFLAGS="-I$(get_build_dir argtable2)/src"
-  export argtable2_LIBS="-L$(get_build_dir argtable2)/src/.libs -largtable2"
-
-# pass ffmpegx to build
-  PKG_CONFIG_PATH="$(get_install_dir ffmpegx)/usr/local/lib/pkgconfig"
+  # pass ffmpegx to build
   CFLAGS+=" -I$(get_install_dir ffmpegx)/usr/local/include"
   LDFLAGS+=" -L$(get_install_dir ffmpegx)/usr/local/lib"
 }
-
-make_target() {
- :
-}
diff --git a/packages/addons/addon-depends/tvh-dtv-scan-tables/package.mk b/packages/addons/addon-depends/tvh-dtv-scan-tables/package.mk
index ae9d83a06e..029af8190b 100644
--- a/packages/addons/addon-depends/tvh-dtv-scan-tables/package.mk
+++ b/packages/addons/addon-depends/tvh-dtv-scan-tables/package.mk
@@ -10,3 +10,8 @@ PKG_URL="https://github.com/tvheadend/dtv-scan-tables/archive/$PKG_VERSION.tar.g
 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 464b9e0103..c03e65816e 100644
--- a/packages/addons/service/tvheadend42/package.mk
+++ b/packages/addons/service/tvheadend42/package.mk
@@ -11,11 +11,12 @@ 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"
-PKG_DEPENDS_UNPACK="tvh-dtv-scan-tables"
+                    libiconv openssl pngquant:host Python3:host tvh-dtv-scan-tables"
+PKG_DEPENDS_CONFIG="ffmpegx"
 PKG_SECTION="service"
 PKG_SHORTDESC="Tvheadend: a TV streaming server for Linux"
 PKG_LONGDESC="Tvheadend ($PKG_VERSION_NUMBER): is a TV streaming server for Linux supporting DVB-S/S2, DVB-C, DVB-T/T2, IPTV, SAT>IP, ATSC and ISDB-T"
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Tvheadend Server 4.2"
@@ -83,7 +84,6 @@ pre_configure_target() {
   rm -rf .$TARGET_NAME
 
 # pass ffmpegx to build
-  PKG_CONFIG_PATH="$(get_install_dir ffmpegx)/usr/local/lib/pkgconfig"
   CFLAGS+=" -I$(get_install_dir ffmpegx)/usr/local/include"
   LDFLAGS+=" -L$(get_install_dir ffmpegx)/usr/local/lib"
 
@@ -98,8 +98,9 @@ post_make_target() {
   $CC -O -fbuiltin -fomit-frame-pointer -fPIC -shared -o capmt_ca.so src/extra/capmt_ca.c -ldl
 }
 
-makeinstall_target() {
-  :
+post_makeinstall_target() {
+  mkdir -p $INSTALL/usr/lib
+  cp -p capmt_ca.so $INSTALL/usr/lib
 }
 
 addon() {
@@ -111,14 +112,12 @@ addon() {
   sed -e "s|@ADDON_VERSION@|$ADDON_VERSION|g" \
       -i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
 
-  cp -P $PKG_BUILD/build.linux/tvheadend $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_BUILD/capmt_ca.so $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp -P $PKG_INSTALL/usr/bin/tvheadend $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp -P $PKG_INSTALL/usr/lib/capmt_ca.so $ADDON_BUILD/$PKG_ADDON_ID/bin
   cp -P $(get_install_dir comskip)/usr/bin/comskip $ADDON_BUILD/$PKG_ADDON_ID/bin
 
   # dvb-scan files
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/dvb-scan
-  cp -r $(get_build_dir tvh-dtv-scan-tables)/atsc \
-        $(get_build_dir tvh-dtv-scan-tables)/dvb-* \
-        $(get_build_dir tvh-dtv-scan-tables)/isdb-t \
+  cp -r $(get_install_dir tvh-dtv-scan-tables)/usr/share/dvbv5/* \
         $ADDON_BUILD/$PKG_ADDON_ID/dvb-scan
 }