diff --git a/packages/addons/service/tvheadend42/changelog.txt b/packages/addons/service/tvheadend42/changelog.txt
index e6cecf2775..aeea117823 100644
--- a/packages/addons/service/tvheadend42/changelog.txt
+++ b/packages/addons/service/tvheadend42/changelog.txt
@@ -1,19 +1,24 @@
-8.0.105
+106
+- update to Tvheadend 4.1.2309
+- service gets restarted at changes in add-on settings
+- improved Tvh defaults
+
+105
 - update to Tvheadend 4.1.2236
 - fixes picons download from Tvh server
 - fixes empty/incomplete frequency scan-tables
 
-8.0.104
+104
 - update to Tvheadend 4.1.2195
 - added TRACE debug option at the addon config
 
-8.0.103
+103
 - update to Tvheadend 4.1.2134
 
-8.0.102
+102
 - update for LibreELEC 8.0
 - update to Tvheadend 4.1.1945
 - fix the XMLTV import script
 
-7.0.100
+100
 - initial LibreELEC version
\ No newline at end of file
diff --git a/packages/addons/service/tvheadend42/package.mk b/packages/addons/service/tvheadend42/package.mk
index 0b34e78d06..bfb3d2590e 100644
--- a/packages/addons/service/tvheadend42/package.mk
+++ b/packages/addons/service/tvheadend42/package.mk
@@ -17,9 +17,9 @@
 ################################################################################
 
 PKG_NAME="tvheadend42"
-PKG_VERSION="817f67e"
-PKG_VERSION_NUMBER="4.1.2236"
-PKG_REV="105"
+PKG_VERSION="0736ebc"
+PKG_VERSION_NUMBER="4.1.2309"
+PKG_REV="106"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.tvheadend.org"
diff --git a/packages/addons/service/tvheadend42/patches/tvheadend42-03_temp_ffmpeg_downgrade.patch b/packages/addons/service/tvheadend42/patches/tvheadend42-03_temp_ffmpeg_downgrade.patch
new file mode 100644
index 0000000000..841dda5ae9
--- /dev/null
+++ b/packages/addons/service/tvheadend42/patches/tvheadend42-03_temp_ffmpeg_downgrade.patch
@@ -0,0 +1,19 @@
+Subject: [PATCH] tvheadend: HACK ffmpeg 3.1.5 instead of 3.2
+
+diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
+--- a/Makefile.ffmpeg
++++ b/Makefile.ffmpeg
+@@ -94,10 +94,10 @@ LIBMFX_URL     = https://github.com/lu-zero/mfx_dispatch/archive/$(LIBMFX_TB)
+ LIBMFX_SHA1    = 84dbdf4a6b409067e863eb9564bb2efdec6d39ce
+ LIBMFX_DIFFS   = libmfx.linux.path.diff
+ 
+-FFMPEG         = ffmpeg-3.2
+-FFMPEG_TB      = $(FFMPEG).tar.bz2
++FFMPEG         = ffmpeg-3.1.5
++FFMPEG_TB      = $(FFMPEG).tar.bz2
+ FFMPEG_URL     = http://ffmpeg.org/releases/$(FFMPEG_TB)
+-FFMPEG_SHA1    = aac4876d1bc4d2cd8d9833b20649c3eed984f6ef
++FFMPEG_SHA1    = 053dfea8c9e057fdf237885decd03147cb2412b1
+ 
+ 
+ # ##############################################################################
diff --git a/packages/addons/service/tvheadend42/source/default.py b/packages/addons/service/tvheadend42/source/default.py
index c6dfcce9f2..3999a0eb31 100644
--- a/packages/addons/service/tvheadend42/source/default.py
+++ b/packages/addons/service/tvheadend42/source/default.py
@@ -1,5 +1,5 @@
 ################################################################################
-#      This file is part of LibreELEC - https://LibreELEC.tv
+#      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
@@ -15,3 +15,21 @@
 #  You should have received a copy of the GNU General Public License
 #  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
+
+import subprocess
+import xbmc
+import xbmcaddon
+
+
+class Monitor(xbmc.Monitor):
+
+   def __init__(self, *args, **kwargs):
+      xbmc.Monitor.__init__(self)
+      self.id = xbmcaddon.Addon().getAddonInfo('id')
+
+   def onSettingsChanged(self):
+      subprocess.call(['systemctl', 'restart', self.id])
+
+
+if __name__ == "__main__":
+   Monitor().waitForAbort()
diff --git a/packages/addons/service/tvheadend42/source/resources/screenshot-01.png b/packages/addons/service/tvheadend42/source/resources/screenshot-01.png
new file mode 100644
index 0000000000..e049349cee
Binary files /dev/null and b/packages/addons/service/tvheadend42/source/resources/screenshot-01.png differ
diff --git a/packages/addons/service/tvheadend42/source/resources/screenshot-02.png b/packages/addons/service/tvheadend42/source/resources/screenshot-02.png
new file mode 100644
index 0000000000..3baa01a479
Binary files /dev/null and b/packages/addons/service/tvheadend42/source/resources/screenshot-02.png differ
diff --git a/packages/addons/service/tvheadend42/source/resources/screenshot-03.png b/packages/addons/service/tvheadend42/source/resources/screenshot-03.png
new file mode 100644
index 0000000000..2b2759ac6f
Binary files /dev/null and b/packages/addons/service/tvheadend42/source/resources/screenshot-03.png differ
diff --git a/packages/addons/service/tvheadend42/source/resources/screenshot-04.png b/packages/addons/service/tvheadend42/source/resources/screenshot-04.png
new file mode 100644
index 0000000000..acba7b4f9d
Binary files /dev/null and b/packages/addons/service/tvheadend42/source/resources/screenshot-04.png differ