diff --git a/scripts/create_addon b/scripts/create_addon
index 4d6dce7de6..1c811dd47e 100755
--- a/scripts/create_addon
+++ b/scripts/create_addon
@@ -104,18 +104,12 @@ if [ "$PKG_IS_ADDON" = "yes" ] ; 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
@@ -126,19 +120,14 @@ if [ "$PKG_IS_ADDON" = "yes" ] ; then
     zip -rq $PKG_ADDON_ID-$CUST_ADDON_VERSION.zip $PKG_ADDON_ID;
     cd - &>/dev/null
 
-    mkdir -p $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID
-    cp $ADDON_BUILD/$PKG_ADDON_ID-$CUST_ADDON_VERSION.zip $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID
+    ADDON_INSTALL_DIR="$TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID"
+    mkdir -p $ADDON_INSTALL_DIR
+    cp $ADDON_BUILD/$PKG_ADDON_ID-$ADDON_VERSION.$PKG_REV.zip $ADDON_INSTALL_DIR
     if [ -f $PKG_DIR/changelog.txt ]; then
-      cp $PKG_DIR/changelog.txt $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/changelog-$CUST_ADDON_VERSION.txt
-    elif [ -f $PKG_BUILD/changelog.txt ]; then
-      cp $PKG_BUILD/changelog.txt $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/changelog-$CUST_ADDON_VERSION.txt
+      cp $PKG_DIR/changelog.txt $ADDON_INSTALL_DIR/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
+      cp $PKG_DIR/icon/icon.png $ADDON_INSTALL_DIR/icon.png
     fi
   fi
 fi