diff --git a/scripts/create_addon b/scripts/create_addon
index 61c11bb8fb..08dcdfe880 100755
--- a/scripts/create_addon
+++ b/scripts/create_addon
@@ -55,24 +55,6 @@ if [ "$PKG_IS_ADDON" = "yes" ] ; then
   unset IFS
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
-  if [ ! -f $ADDON_BUILD/$PKG_ADDON_ID/addon.xml ]; then
-    cp config/addon/${PKG_ADDON_TYPE}.xml $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
-    PROVIDER_NAME="openelec.tv"
-    if [ ! -z "$PKG_MAINTAINER" ] ; then
-      PROVIDER_NAME="$PKG_MAINTAINER"
-    fi
-    $SED -e "s|@PKG_ADDON_ID@|$PKG_ADDON_ID|g" \
-         -e "s|@PKG_NAME@|$PKG_NAME|g" \
-         -e "s|@ADDON_VERSION@|$ADDON_VERSION.$PKG_REV|g" \
-         -e "s|@REQUIRES@|$REQUIRES|g" \
-         -e "s|@PKG_SHORTDESC@|$PKG_SHORTDESC|g" \
-         -e "s|@OS_VERSION@|$OS_VERSION|g" \
-         -e "s|@PKG_LONGDESC@|$PKG_LONGDESC|g" \
-         -e "s|@PKG_DISCLAIMER@|$PKG_DISCLAIMER|g" \
-         -e "s|@PROVIDER_NAME@|$PROVIDER_NAME|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
@@ -91,6 +73,25 @@ if [ "$PKG_IS_ADDON" = "yes" ] ; then
     echo "*** WARNING: It's recommended to have a $PKG_DIR/changelog.txt file ***"
   fi
 
+  if [ ! -f $ADDON_BUILD/$PKG_ADDON_ID/addon.xml ]; then
+    cp config/addon/${PKG_ADDON_TYPE}.xml $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
+  fi
+
+  PROVIDER_NAME="openelec.tv"
+  if [ ! -z "$PKG_MAINTAINER" ] ; then
+    PROVIDER_NAME="$PKG_MAINTAINER"
+  fi
+  $SED -e "s|@PKG_ADDON_ID@|$PKG_ADDON_ID|g" \
+       -e "s|@PKG_NAME@|$PKG_NAME|g" \
+       -e "s|@ADDON_VERSION@|$ADDON_VERSION.$PKG_REV|g" \
+       -e "s|@REQUIRES@|$REQUIRES|g" \
+       -e "s|@PKG_SHORTDESC@|$PKG_SHORTDESC|g" \
+       -e "s|@OS_VERSION@|$OS_VERSION|g" \
+       -e "s|@PKG_LONGDESC@|$PKG_LONGDESC|g" \
+       -e "s|@PKG_DISCLAIMER@|$PKG_DISCLAIMER|g" \
+       -e "s|@PROVIDER_NAME@|$PROVIDER_NAME|g" \
+       -i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
+
   if [ "$2" != "-test" ] ; then
     cd $ADDON_BUILD
     echo "*** compressing Addon $PKG_ADDON_ID ... ***"