diff --git a/packages/multimedia/hts-tvheadend/config/tv-server.conf b/packages/multimedia/hts-tvheadend/config/tv-server.conf
deleted file mode 100644
index da434a2416..0000000000
--- a/packages/multimedia/hts-tvheadend/config/tv-server.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-################################################################################
-#      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
-################################################################################
-# tv-server.conf
-
-# This configuration file allows you to setup the TV-Server
-
-# Start TV.Headend at boot ( yes / no )
-  TVHEADEND_START="no"
diff --git a/packages/multimedia/hts-tvheadend/init.d/81_tvheadend b/packages/multimedia/hts-tvheadend/init.d/81_tvheadend
index adcf6db89f..efb804bafe 100644
--- a/packages/multimedia/hts-tvheadend/init.d/81_tvheadend
+++ b/packages/multimedia/hts-tvheadend/init.d/81_tvheadend
@@ -22,9 +22,11 @@
 #
 # runlevels: openelec, textmode
 
+OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml"
+
 (
-  if [ -f /storage/.config/tv-server.conf ]; then
-    . /storage/.config/tv-server.conf
+  if [ -f "$OPENELEC_SETTINGS" ]; then
+    TVHEADEND_START=`grep TVHEADEND_START $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
 
     if [ "$TVHEADEND_START" = "yes" ]; then
       progress "starting TV Server"
diff --git a/packages/multimedia/hts-tvheadend/install b/packages/multimedia/hts-tvheadend/install
index 6ad1ddeff8..accbea5078 100755
--- a/packages/multimedia/hts-tvheadend/install
+++ b/packages/multimedia/hts-tvheadend/install
@@ -24,6 +24,3 @@
 
 mkdir -p $INSTALL/usr/bin
   cp -P $PKG_BUILD/build.Linux/tvheadend $INSTALL/usr/bin
-
-mkdir -p $INSTALL/usr/config
-  cp $PKG_DIR/config/tv-server.conf $INSTALL/usr/config