diff --git a/packages/addons/service/multimedia/hts-tvheadend/changelog.txt b/packages/addons/service/multimedia/hts-tvheadend/changelog.txt
index da8981dbf1..93381305b0 100644
--- a/packages/addons/service/multimedia/hts-tvheadend/changelog.txt
+++ b/packages/addons/service/multimedia/hts-tvheadend/changelog.txt
@@ -1,3 +1,6 @@
+1.90.2
+- depends on xbmc.python API 2.0
+
 1.90.1
 - update to hts-tvheadend-fdc743f
 
diff --git a/packages/addons/service/multimedia/hts-tvheadend/meta b/packages/addons/service/multimedia/hts-tvheadend/meta
index 999e8c46b0..ceff445edf 100644
--- a/packages/addons/service/multimedia/hts-tvheadend/meta
+++ b/packages/addons/service/multimedia/hts-tvheadend/meta
@@ -20,7 +20,7 @@
 
 PKG_NAME="hts-tvheadend"
 PKG_VERSION="fdc743f"
-PKG_REV="1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tv_grab_file b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tv_grab_file
index 76b9e64eb6..8029e80ad0 100755
--- a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tv_grab_file
+++ b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tv_grab_file
@@ -1,5 +1,27 @@
 #!/bin/sh
 
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program 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, or (at your option)
+#  any later version.
+#
+#  This Program 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 OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. /etc/profile
+
 ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend"
 ADDON_SETTINGS="$ADDON_HOME/settings.xml"
 XMLTV_TYPE=`grep XMLTV_TYPE $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.service b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.service
index c680b8d0dd..f34d4097db 100755
--- a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.service
+++ b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.service
@@ -20,6 +20,8 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
+. /etc/profile
+
 ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.hts-tvheadend"
 ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend"
 LOG_FILE="$ADDON_HOME/service.log"
diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/default.py b/packages/addons/service/multimedia/hts-tvheadend/source/default.py
index b386a8df08..ccbf8b109d 100644
--- a/packages/addons/service/multimedia/hts-tvheadend/source/default.py
+++ b/packages/addons/service/multimedia/hts-tvheadend/source/default.py
@@ -18,6 +18,15 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-import xbmc, time, os, subprocess
+import os
+import sys
+import xbmcaddon
 
-os.system("tvheadend.service")
+__scriptname__ = "HTS TVheadend Service"
+__author__ = "OpenELEC"
+__url__ = "http://www.openelec.tv"
+__settings__   = xbmcaddon.Addon(id='service.multimedia.hts-tvheadend')
+__cwd__        = __settings__.getAddonInfo('path')
+__path__       = xbmc.translatePath( os.path.join( __cwd__, 'bin', "tvheadend.service") )
+
+os.system(__path__)