diff --git a/scripts/create_addon b/scripts/create_addon
index 1b2a28072f..0aed09d4c5 100755
--- a/scripts/create_addon
+++ b/scripts/create_addon
@@ -75,12 +75,18 @@ if [ -f $PKG_DIR/addon ]; then
 
     if [ -f $PKG_DIR/icon/icon.png ]; then
       cp $PKG_DIR/icon/icon.png $ADDON_BUILD/$PKG_ADDON_ID
+    elif [ -f $PKG_BUILD/icon/icon.png ]; then
+      cp $PKG_BUILD/icon/icon.png $ADDON_BUILD/$PKG_ADDON_ID
+    elif [ -f $PKG_BUILD/icon.png ]; then
+      cp $PKG_BUILD/icon.png $ADDON_BUILD/$PKG_ADDON_ID
     else
       echo "*** WARNING: It's recommended to have a $PKG_DIR/icon/icon.png file ***"
     fi
 
     if [ -f $PKG_DIR/changelog.txt ]; then
       cp $PKG_DIR/changelog.txt $ADDON_BUILD/$PKG_ADDON_ID
+    elif [ -f $PKG_BUILD/changelog.txt ]; then
+      cp $PKG_BUILD/changelog.txt $ADDON_BUILD/$PKG_ADDON_ID
     else
       echo "*** WARNING: It's recommended to have a $PKG_DIR/changelog.txt file ***"
     fi
@@ -96,6 +102,16 @@ if [ -f $PKG_DIR/addon ]; then
 
   mkdir -p $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID
     cp $ADDON_BUILD/$PKG_ADDON_ID-$ADDON_VERSION.$PKG_REV.zip $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID
-    cp $PKG_DIR/changelog.txt $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/changelog-$ADDON_VERSION.$PKG_REV.txt
-    cp $PKG_DIR/icon/icon.png $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/icon.png
+    if [ -f $PKG_DIR/changelog.txt ]; then
+      cp $PKG_DIR/changelog.txt $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/changelog-$ADDON_VERSION.$PKG_REV.txt
+    elif [ -f $PKG_BUILD/changelog.txt ]; then
+      cp $PKG_BUILD/changelog.txt $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/changelog-$ADDON_VERSION.$PKG_REV.txt
+    fi
+    if [ -f $PKG_DIR/icon/icon.png ]; then
+      cp $PKG_DIR/icon/icon.png $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/icon.png
+    elif [ -f $PKG_BUILD/icon/icon.png ]; then
+      cp $PKG_BUILD/icon/icon.png $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/icon.png
+    elif [ -f $PKG_BUILD/icon.png ]; then
+      cp $PKG_BUILD/icon.png $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/icon.png
+    fi
 fi