diff --git a/packages/addons/service/tvheadend42/changelog.txt b/packages/addons/service/tvheadend42/changelog.txt
new file mode 100644
index 0000000000..2907dab344
--- /dev/null
+++ b/packages/addons/service/tvheadend42/changelog.txt
@@ -0,0 +1,2 @@
+7.0.100
+- initial LibreELEC version
\ No newline at end of file
diff --git a/packages/addons/service/tvheadend42/icon/icon.png b/packages/addons/service/tvheadend42/icon/icon.png
new file mode 100644
index 0000000000..846eb14b18
Binary files /dev/null and b/packages/addons/service/tvheadend42/icon/icon.png differ
diff --git a/packages/addons/service/tvheadend42/package.mk b/packages/addons/service/tvheadend42/package.mk
new file mode 100644
index 0000000000..6c88cf7c10
--- /dev/null
+++ b/packages/addons/service/tvheadend42/package.mk
@@ -0,0 +1,86 @@
+################################################################################
+# This file is part of LibreELEC - https://LibreELEC.tv
+# Copyright (C) 2016 Team LibreELEC
+#
+# LibreELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# LibreELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LibreELEC. If not, see .
+################################################################################
+
+PKG_NAME="tvheadend42"
+PKG_VERSION="a4afbee"
+PKG_VERSION_NUMBER="4.1.1832"
+PKG_REV="100"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.tvheadend.org"
+PKG_URL="https://github.com/tvheadend/tvheadend/archive/$PKG_VERSION.tar.gz"
+PKG_SOURCE_DIR="tvheadend-${PKG_VERSION}*"
+PKG_DEPENDS_TARGET="toolchain curl libdvbcsa libiconv libressl Python:host yasm"
+PKG_PRIORITY="optional"
+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_IS_ADDON="yes"
+PKG_ADDON_NAME="Tvheadend 4.2"
+PKG_ADDON_TYPE="xbmc.service"
+PKG_AUTORECONF="no"
+PKG_ADDON_REPOVERSION="7.0"
+
+PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \
+ --arch=$TARGET_ARCH \
+ --cpu=$TARGET_CPU \
+ --cc=$TARGET_CC \
+ --disable-avahi \
+ --enable-bundle \
+ --disable-dbus_1 \
+ --enable-dvbcsa \
+ --disable-dvben50221 \
+ --enable-hdhomerun_client \
+ --enable-hdhomerun_static \
+ --enable-epoll \
+ --enable-inotify \
+ --disable-nvenc \
+ --disable-uriparser \
+ --disable-libav \
+ --disable-ffmpeg_static \
+ --enable-tvhcsa \
+ --nowerror \
+ --python=$ROOT/$TOOLCHAIN/bin/python"
+
+post_unpack() {
+ sed -e 's/VER="0.0.0~unknown"/VER="'$PKG_VERSION_NUMBER' ~ LibreELEC Tvh-addon v'$PKG_ADDON_REPOVERSION'.'$PKG_REV'"/g' -i $PKG_BUILD/support/version
+}
+
+pre_configure_target() {
+# fails to build in subdirs
+ cd $ROOT/$PKG_BUILD
+ rm -rf .$TARGET_NAME
+
+ export CROSS_COMPILE=$TARGET_PREFIX
+ export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/iconv -L$SYSROOT_PREFIX/usr/lib/iconv"
+}
+
+post_make_target() {
+ $CC -O -fbuiltin -fomit-frame-pointer -fPIC -shared -o capmt_ca.so src/extra/capmt_ca.c -ldl
+}
+
+makeinstall_target() {
+ : # nothing to do here
+}
+
+addon() {
+ 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/tvheadend42/source/bin/tv_grab_file b/packages/addons/service/tvheadend42/source/bin/tv_grab_file
new file mode 100755
index 0000000000..68f466879c
--- /dev/null
+++ b/packages/addons/service/tvheadend42/source/bin/tv_grab_file
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+################################################################################
+# This file is part of LibreELEC - https://LibreELEC.tv
+# Copyright (C) 2016 Team LibreELEC
+#
+# LibreELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# LibreELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LibreELEC. If not, see .
+################################################################################
+
+. /etc/profile
+
+ADDON_HOME="$HOME/.kodi/userdata/addon_data/service.tvheadend42"
+ADDON_SETTINGS="$ADDON_HOME/settings.xml"
+XMLTV_TYPE=`grep XMLTV_TYPE $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+XMLTV_LOCATION_FILE=`grep XMLTV_LOCATION_FILE $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+XMLTV_LOCATION_WEB=`grep XMLTV_LOCATION_WEB $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+XMLTV_LOCATION_SCRIPT=`grep XMLTV_LOCATION_SCRIPT $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+
+if [ "$XMLTV_TYPE" = "FILE" ]; then
+ cat "$XMLTV_LOCATION_FILE"
+ exit 0
+elif [ "$XMLTV_TYPE" = "SCRIPT" ]; then
+ if [ -e "$XMLTV_LOCATION_SCRIPT" ] ; then
+ exec "$XMLTV_LOCATION_SCRIPT"
+ fi
+elif [ "$XMLTV_TYPE" = "WEB" ]; then
+ wget -qO - "$XMLTV_LOCATION_WEB"
+ exit 0
+fi
diff --git a/packages/addons/service/tvheadend42/source/bin/tvheadend42.start b/packages/addons/service/tvheadend42/source/bin/tvheadend42.start
new file mode 100755
index 0000000000..5a5067c04b
--- /dev/null
+++ b/packages/addons/service/tvheadend42/source/bin/tvheadend42.start
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+################################################################################
+# This file is part of LibreELEC - https://LibreELEC.tv
+# Copyright (C) 2016 Team LibreELEC
+#
+# LibreELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# LibreELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LibreELEC. If not, see .
+################################################################################
+
+. /etc/profile
+
+oe_setup_addon service.tvheadend42
+
+ADDON_SETTINGS="$ADDON_HOME/settings.xml"
+
+DVR_SETTINGS_DIR="$ADDON_HOME/dvr/config"
+DVR_SETTINGS_FILE="$DVR_SETTINGS_DIR/8d0f5b7ae354d956d7fe5db25f5d0d24"
+
+EPGGRAB_SETTINGS_DIR="$ADDON_HOME/epggrab"
+EPGGRAB_SETTINGS_FILE="$EPGGRAB_SETTINGS_DIR/config"
+
+TIMESHIFT_SETTINGS_DIR="$ADDON_HOME/timeshift"
+TIMESHIFT_SETTINGS_FILE="$TIMESHIFT_SETTINGS_DIR/config"
+
+TVH_SETTINGS_DIR="$ADDON_HOME"
+TVH_SETTINGS_FILE="$TVH_SETTINGS_DIR/config"
+
+XMLTV_SETTINGS_DIR="$ADDON_HOME/xmltv"
+XMLTV_SETTINGS_FILE="$XMLTV_SETTINGS_DIR/config"
+
+TIMESHIFT_DIR="$ADDON_HOME/cache/timeshift"
+XMLTV_FILE="$ADDON_DIR/bin/tv_grab_file"
+
+chmod a+x $ADDON_DIR/bin/*
+
+# copy config files to userdata
+if [ ! -f "$DVR_SETTINGS_FILE" ]; then
+ mkdir -p $DVR_SETTINGS_DIR
+ cp $ADDON_DIR/defaults/dvr/config/8d0f5b7ae354d956d7fe5db25f5d0d24 $DVR_SETTINGS_FILE
+fi
+
+if [ ! -f "$EPGGRAB_SETTINGS_FILE" ]; then
+ mkdir -p $EPGGRAB_SETTINGS_DIR
+ cp $ADDON_DIR/defaults/epggrab/config $EPGGRAB_SETTINGS_FILE
+fi
+
+if [ ! -f "$TIMESHIFT_SETTINGS_FILE" ]; then
+ mkdir -p $TIMESHIFT_DIR
+ mkdir -p $TIMESHIFT_SETTINGS_DIR
+ cp $ADDON_DIR/defaults/timeshift/config $TIMESHIFT_SETTINGS_FILE
+fi
+
+if [ ! -f "$TVH_SETTINGS_FILE" ]; then
+ mkdir -p $TVH_SETTINGS_DIR
+ cp $ADDON_DIR/defaults/config $TVH_SETTINGS_FILE
+fi
+
+if [ ! -f "$XMLTV_SETTINGS_FILE" ]; then
+ mkdir -p $XMLTV_SETTINGS_DIR
+ cp $ADDON_DIR/defaults/xmltv/config $XMLTV_SETTINGS_FILE
+fi
+
+# options
+if [ "$WORKAROUND_SLEEP" == "true" ] ; then
+ sleep $WORKAROUND_SLEEP_TIME
+fi
+
+if [ "$DEBUG" = "yes" ]; then
+ TVHEADEND_ARG="-B -C -s -u root -g video -c $ADDON_HOME"
+else
+ TVHEADEND_ARG="-B -C -u root -g video -c $ADDON_HOME"
+fi
+
+# start userspace DVB driver/addon
+for driver_dvb in $(find /storage/.kodi/addons/driver.dvb.*/bin/userspace-driver.sh -type f 2>/dev/null); do
+ driver_dvb_name=$(echo $driver_dvb | awk 'BEGIN {FS="/"} {printf("%s", $5)}')
+ logger -t Tvheadend "### Loading userspace DVB driver: $driver_dvb_name ###"
+ # use ". " because of variable export
+ . $driver_dvb
+done
+
+if [ "$WAIT_FOR_FEINIT" == "true" ] ; then
+ while [ true ] ; do
+ if [ -e /dev/dvb/adapter$((NUM_ADAPTERS-1))/frontend0 ] ; then
+ break
+ fi
+ sleep 1
+ done
+fi
+
+if [ "$PRELOAD_CAPMT_CA" == "true" ] ; then
+ logger -t Tvheadend "### Preloading capmt_ca.so library ###"
+ LD_PRELOAD="$ADDON_DIR/bin/capmt_ca.so $LD_PRELOAD" exec $ADDON_DIR/bin/tvheadend $TVHEADEND_ARG &>$ADDON_LOG_FILE
+else
+ exec $ADDON_DIR/bin/tvheadend $TVHEADEND_ARG &>$ADDON_LOG_FILE
+fi
diff --git a/packages/addons/service/tvheadend42/source/default.py b/packages/addons/service/tvheadend42/source/default.py
new file mode 100644
index 0000000000..c6dfcce9f2
--- /dev/null
+++ b/packages/addons/service/tvheadend42/source/default.py
@@ -0,0 +1,17 @@
+################################################################################
+# This file is part of LibreELEC - https://LibreELEC.tv
+# Copyright (C) 2016 Team LibreELEC
+#
+# LibreELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# LibreELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LibreELEC. If not, see .
+################################################################################
diff --git a/packages/addons/service/tvheadend42/source/defaults/config b/packages/addons/service/tvheadend42/source/defaults/config
new file mode 100644
index 0000000000..4d6fa4c747
--- /dev/null
+++ b/packages/addons/service/tvheadend42/source/defaults/config
@@ -0,0 +1,12 @@
+{
+ "uilevel": 1,
+ "uilevel_nochange": false,
+ "ui_quicktips": true,
+ "cookie_expires": 14,
+ "epg_compress": true,
+ "prefer_picon": true,
+ "chiconpath": "file:///storage/picons/tvh/%C.png",
+ "chiconscheme": 2,
+ "piconpath": "file:///storage/picons/vdr/",
+ "piconscheme": 1
+}
diff --git a/packages/addons/service/tvheadend42/source/defaults/dvr/config/8d0f5b7ae354d956d7fe5db25f5d0d24 b/packages/addons/service/tvheadend42/source/defaults/dvr/config/8d0f5b7ae354d956d7fe5db25f5d0d24
new file mode 100644
index 0000000000..26b820aaa4
--- /dev/null
+++ b/packages/addons/service/tvheadend42/source/defaults/dvr/config/8d0f5b7ae354d956d7fe5db25f5d0d24
@@ -0,0 +1,15 @@
+{
+ "storage": "/storage/recordings",
+ "retention-days": 31,
+ "pre-extra-time": 0,
+ "post-extra-time": 0,
+ "day-dir": 0,
+ "channel-dir": 0,
+ "channel-in-title": 0,
+ "date-in-title": 0,
+ "time-in-title": 0,
+ "whitespace-in-title": 0,
+ "title-dir": 0,
+ "episode-in-title": 0,
+ "tag-files": 1
+}
diff --git a/packages/addons/service/tvheadend42/source/defaults/epggrab/config b/packages/addons/service/tvheadend42/source/defaults/epggrab/config
new file mode 100644
index 0000000000..35c5f70d5e
--- /dev/null
+++ b/packages/addons/service/tvheadend42/source/defaults/epggrab/config
@@ -0,0 +1,16 @@
+{
+ "channel_rename": true,
+ "channel_renumber": false,
+ "channel_reicon": false,
+ "epgdb_periodicsave": 2,
+ "ota_initial": true,
+ "modules": {
+ "eit": {
+ "class": "epggrab_mod_ota",
+ "name": "EIT: DVB Grabber",
+ "type": "Over-the-air",
+ "enabled": true,
+ "priority": 1
+ }
+ }
+}
diff --git a/packages/addons/service/tvheadend42/source/defaults/timeshift/config b/packages/addons/service/tvheadend42/source/defaults/timeshift/config
new file mode 100644
index 0000000000..1ac8f3f116
--- /dev/null
+++ b/packages/addons/service/tvheadend42/source/defaults/timeshift/config
@@ -0,0 +1,9 @@
+{
+ "enabled": 0,
+ "ondemand": 0,
+ "path": "/storage/.kodi/userdata/addon_data/service.tvheadend42/cache/timeshift",
+ "unlimited_period": 0,
+ "max_period": 3600,
+ "unlimited_size": 0,
+ "max_size": 3072
+}
diff --git a/packages/addons/service/tvheadend42/source/defaults/xmltv/config b/packages/addons/service/tvheadend42/source/defaults/xmltv/config
new file mode 100644
index 0000000000..8093bd3531
--- /dev/null
+++ b/packages/addons/service/tvheadend42/source/defaults/xmltv/config
@@ -0,0 +1,14 @@
+{
+ "grabbers": [
+ {
+ "path": "/storage/.kodi/addons/service.tvheadend42/bin/tv_grab_file",
+ "description": "tv_grag_file is a simple grabber that just read the ~/.xmltv/tv_grab_file.xmltv file",
+ "version": "0.1\n",
+ "mtime": 1318774706,
+ "capabilities": 1
+ }
+ ],
+ "grab-interval": 12,
+ "grab-enabled": 1,
+ "current-grabber": "/storage/.kodi/addons/service.tvheadend42/bin/tv_grab_file"
+}
diff --git a/packages/addons/service/tvheadend42/source/resources/language/English/strings.xml b/packages/addons/service/tvheadend42/source/resources/language/English/strings.xml
new file mode 100644
index 0000000000..fc94d15dfd
--- /dev/null
+++ b/packages/addons/service/tvheadend42/source/resources/language/English/strings.xml
@@ -0,0 +1,18 @@
+
+
+
+ XMLTV
+ DVB
+ XMLTV configuration
+ XMLTV source type
+ XMLTV File location
+ XMLTV Web location
+ XMLTV Script location
+ DVB Configuration
+ Unload DVB mudules before suspend
+ Wait for frontend initialization
+ Number of adapters to wait for
+ Preload capmt_ca.so library
+ Delay the start of Tvheadend
+ time (s)
+
diff --git a/packages/addons/service/tvheadend42/source/resources/settings.xml b/packages/addons/service/tvheadend42/source/resources/settings.xml
new file mode 100644
index 0000000000..6f6ddc37b4
--- /dev/null
+++ b/packages/addons/service/tvheadend42/source/resources/settings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/addons/service/tvheadend42/source/settings-default.xml b/packages/addons/service/tvheadend42/source/settings-default.xml
new file mode 100644
index 0000000000..0f47b8e232
--- /dev/null
+++ b/packages/addons/service/tvheadend42/source/settings-default.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/addons/service/tvheadend42/source/sleep.d/tvheadend.power b/packages/addons/service/tvheadend42/source/sleep.d/tvheadend.power
new file mode 100755
index 0000000000..ca66f083ff
--- /dev/null
+++ b/packages/addons/service/tvheadend42/source/sleep.d/tvheadend.power
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+################################################################################
+# This file is part of LibreELEC - https://LibreELEC.tv
+# Copyright (C) 2016 Team LibreELEC
+#
+# LibreELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# LibreELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LibreELEC. If not, see .
+################################################################################
+
+. /etc/profile
+
+oe_setup_addon service.tvheadend42
+
+SERVICE="service.tvheadend42"
+
+case "$1" in
+ pre)
+ if systemctl is-active "$SERVICE" &>/dev/null ; then
+ systemctl stop "$SERVICE"
+ for module in $REMOVE_MODULES ; do
+ rmmod $module
+ done
+ fi
+ ;;
+ post)
+ if systemctl is-enabled "$SERVICE" &>/dev/null ; then
+ for module in $REMOVE_MODULES ; do
+ modprobe $module
+ done
+ systemctl start "$SERVICE"
+ fi
+ ;;
+esac
diff --git a/packages/addons/service/tvheadend42/source/system.d/service.tvheadend42.service b/packages/addons/service/tvheadend42/source/system.d/service.tvheadend42.service
new file mode 100644
index 0000000000..e92c783ee8
--- /dev/null
+++ b/packages/addons/service/tvheadend42/source/system.d/service.tvheadend42.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=TVHeadend42 Service
+After=network-online.service
+Requires=network-online.service
+
+[Service]
+ExecStart=/bin/sh -c "exec sh /storage/.kodi/addons/service.tvheadend42/bin/tvheadend42.start"
+TimeoutStopSec=2
+Restart=always
+RestartSec=2
+StartLimitInterval=0
+
+[Install]
+WantedBy=kodi.target