diff --git a/scripts/create_addon b/scripts/create_addon
index 9d64210415..c183c017da 100755
--- a/scripts/create_addon
+++ b/scripts/create_addon
@@ -53,7 +53,8 @@ if [ -f $PKG_DIR/addon ]; then
   $PKG_DIR/addon $@ >&$VERBOSE_OUT
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
-    cp config/addon/addon.xml $ADDON_BUILD/$PKG_ADDON_ID
+    if [ ! -f $ADDON_BUILD/$PKG_ADDON_ID/addon.xml ]; then
+      cp config/addon/addon.xml $ADDON_BUILD/$PKG_ADDON_ID
       $SED -e "s|@PKG_ADDON_ID@|$PKG_ADDON_ID|g" \
            -e "s|@PKG_NAME@|$PKG_NAME|g" \
            -e "s|@ADDON_VERSION@|$OS_VERSION.$PKG_REV|g" \
@@ -63,12 +64,12 @@ if [ -f $PKG_DIR/addon ]; then
            -e "s|@OS_VERSION@|$OS_VERSION|g" \
            -e "s|@PKG_LONGDESC@|$PKG_LONGDESC|g" \
            -i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
+    fi
 
     if [ -f $PKG_DIR/source/default.py ]; then
       cp -R $PKG_DIR/source/* $ADDON_BUILD/$PKG_ADDON_ID
     else
-      echo "*** ERROR: you need at least $PKG_DIR/source/default.py so your addon can work ***"
-      exit 1
+      echo "*** WARNING: you *maybe* need at least $PKG_DIR/source/default.py so your addon can work ***"
     fi
 
     if [ -f $PKG_DIR/icon/icon.png ]; then