diff --git a/scripts/create_addon b/scripts/create_addon
index b68e40a911..617569e8bd 100755
--- a/scripts/create_addon
+++ b/scripts/create_addon
@@ -44,19 +44,19 @@ if [ -f $PKG_DIR/addon ]; then
   $PKG_DIR/addon $@ >&$VERBOSE_OUT
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
-    cp config/addon/default.py $ADDON_BUILD/$PKG_ADDON_ID
     cp config/addon/addon.xml $ADDON_BUILD/$PKG_ADDON_ID
       $SED -e "s|@PKG_ADDON_ID@|$PKG_ADDON_ID|g" \
            -e "s|@ADDON_VERSION@|$OS_VERSION.$PKG_REV|g" \
+           -e "s|@PKG_ADDON_TYPE@|$PKG_ADDON_TYPE|g" \
            -e "s|@PKG_SHORTDESC@|$PKG_SHORTDESC|g" \
            -e "s|@OS_VERSION@|$OS_VERSION|g" \
            -e "s|@PKG_LONGDESC@|$PKG_LONGDESC|g" \
            -i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
 
-    if [ -f $PKG_DIR/scripts/start.sh ]; then
-      cp $PKG_DIR/scripts/start.sh $ADDON_BUILD/$PKG_ADDON_ID
+    if [ -f $PKG_DIR/source/default.py ]; then
+      cp -R $PKG_DIR/source/* $ADDON_BUILD/$PKG_ADDON_ID
     else
-      echo "*** ERROR: you need $PKG_DIR/scripts/start.sh so your addon can work ***"
+      echo "*** ERROR: you need at least $PKG_DIR/source/default.py so your addon can work ***"
       exit 1
     fi