diff --git a/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start b/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start
index ea5a2476db..7d9b372728 100755
--- a/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start
+++ b/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start
@@ -38,8 +38,21 @@ DVR_SETTINGS_DIR="$ADDON_HOME/dvr"
 DVR_SETTINGS_FILE="$DVR_SETTINGS_DIR/config"
 DVR_DIR="$HOME/recordings"
 
+## handle upgrade. this should be removed later
+
 # remove any old hts-tvheadend dir
+if [ -d $HOME/.xbmc/addons/service.multimedia.hts-tvheadend ] ; then
+  # stop old service if runing
+  $HOME/.xbmc/addons/service.multimedia.hts-tvheadend/bin/tvheadend.stop
   rm -rf $HOME/.xbmc/addons/service.multimedia.hts-tvheadend
+fi
+
+# reuse old config files
+if [ -d $HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend ] ; then
+  mv $HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend $ADDON_HOME
+  sed -i 's/service.multimedia.hts-tvheadend/service.multimedia.tvheadend/g' $ADDON_HOME/xmltv/config
+fi
+##
 
 if [ ! -f "$ADDON_SETTINGS" ]; then
   if [ -f $ADDON_DIR/settings-default.xml ]; then