diff --git a/packages/addons/service/multimedia/tvheadend/addon b/packages/addons/service/multimedia/tvheadend/addon
index 95207a9919..018d2662aa 100755
--- a/packages/addons/service/multimedia/tvheadend/addon
+++ b/packages/addons/service/multimedia/tvheadend/addon
@@ -29,3 +29,4 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
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
diff --git a/packages/addons/service/multimedia/tvheadend/build b/packages/addons/service/multimedia/tvheadend/build
index e174adaab6..c45ce63d65 100755
--- a/packages/addons/service/multimedia/tvheadend/build
+++ b/packages/addons/service/multimedia/tvheadend/build
@@ -37,3 +37,6 @@ cd $PKG_BUILD
--enable-bundle
make
+
+# compile capmt_ca.so library
+$CC -O -fbuiltin -fomit-frame-pointer -fPIC -shared -o capmt_ca.so src/extra/capmt_ca.c -ldl
diff --git a/packages/addons/service/multimedia/tvheadend/config/settings.xml b/packages/addons/service/multimedia/tvheadend/config/settings.xml
index 8fec81edba..a78e7f48e5 100644
--- a/packages/addons/service/multimedia/tvheadend/config/settings.xml
+++ b/packages/addons/service/multimedia/tvheadend/config/settings.xml
@@ -4,4 +4,5 @@
+
diff --git a/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start b/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start
index 7d9b372728..08c859ea9b 100755
--- a/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start
+++ b/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start
@@ -119,6 +119,11 @@ mkdir -p $ADDON_HOME
sleep 1
continue
fi
- $ADDON_BIN $TVHEADEND_ARG &>$LOG_FILE
+ if [ "$PRELOAD_CAPMT_CA" == "true" ] ; then
+ logger -t Tvheadend "### Preloading capmt_ca.so library ###"
+ LD_PRELOAD=$ADDON_DIR/bin/capmt_ca.so $ADDON_BIN $TVHEADEND_ARG &>$LOG_FILE
+ else
+ $ADDON_BIN $TVHEADEND_ARG &>$LOG_FILE
+ fi
done &
fi
diff --git a/packages/addons/service/multimedia/tvheadend/source/resources/language/English/strings.xml b/packages/addons/service/multimedia/tvheadend/source/resources/language/English/strings.xml
index f718c0d9bd..3c90281869 100644
--- a/packages/addons/service/multimedia/tvheadend/source/resources/language/English/strings.xml
+++ b/packages/addons/service/multimedia/tvheadend/source/resources/language/English/strings.xml
@@ -12,5 +12,6 @@
Unload DVB mudules before suspend
Wait for frontend initialization
Number of adapters to wait for
+ Preload capmt_ca.so library
diff --git a/packages/addons/service/multimedia/tvheadend/source/resources/settings.xml b/packages/addons/service/multimedia/tvheadend/source/resources/settings.xml
index 3a84c2d295..dcc5a1b567 100644
--- a/packages/addons/service/multimedia/tvheadend/source/resources/settings.xml
+++ b/packages/addons/service/multimedia/tvheadend/source/resources/settings.xml
@@ -15,5 +15,6 @@
+