diff --git a/packages/addons/service/multimedia/vdr-addon/addon b/packages/addons/service/multimedia/vdr-addon/addon
index f2fb5bcd65..9cf2998d22 100755
--- a/packages/addons/service/multimedia/vdr-addon/addon
+++ b/packages/addons/service/multimedia/vdr-addon/addon
@@ -42,8 +42,8 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/live
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins
   cp $BUILD/rotorng-[0-9]*/examples/rotorng.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins
 
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/epgdata2xmltv
-  cp $BUILD/vdr-plugin-xmltv2vdr*/dist/epgdata2xmltv/epgdata2xmltv.dist $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/epgdata2xmltv/
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/
+  cp $BUILD/vdr-plugin-xmltv2vdr*/dist/epgdata2xmltv/epgdata2xmltv.dist $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/epgdata2xmltv
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $BUILD/vdr-[0-9]*/.install/usr/lib/vdr/libvdr-dvbhddevice.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
diff --git a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
index 8c0a7d8188..01a3b9e3da 100755
--- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
+++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
@@ -46,8 +46,18 @@ fi
 mkdir -p /var/config
 cat "$ADDON_DIR/settings-default.xml" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/vdr.conf.default
 cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/vdr.conf
+
+#handle epgsources
 mkdir -p /var/lib/epgsources
-cp $ADDON_DIR/config/epgsources/epgdata2xmltv/epgdata2xmltv.dist /var/lib/epgsources/epgdata2xmltv
+mkdir -p $ADDON_HOME/config/epgsources
+for source in `find $ADDON_DIR/config/epgsources -type f`; do
+  if [ ! -e $ADDON_HOME/config/epgsources/`basename $source` ] ; then
+    cp $source $ADDON_HOME/config/epgsources/
+  fi
+done
+for source in `find $ADDON_HOME/config/epgsources -type f`; do
+  cp $source /var/lib/epgsources
+done
 
 . /var/config/vdr.conf.default
 . /var/config/vdr.conf