diff --git a/scripts/image b/scripts/image
index 4e927a4b83..b2574d1747 100755
--- a/scripts/image
+++ b/scripts/image
@@ -214,16 +214,18 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
 
     # create release dir
       mkdir -p $RELEASE_DIR
-        if [ "$BOOTLOADER" = "syslinux" ]; then
-          cp -R $CONFIG/release/3rdparty $RELEASE_DIR
-          cp -R $CONFIG/release/sample.conf $RELEASE_DIR
-          cp -R $CONFIG/release/Autorun.inf $RELEASE_DIR
-          cp -R $CONFIG/release/create_installstick* $RELEASE_DIR
+        if [ -n "$BOOTLOADER" ]; then
+          BOOTLOADER_DIR=`find $PACKAGES -type d -name $BOOTLOADER 2>/dev/null`
+          if [ -d "$BOOTLOADER_DIR"/files ]; then
+            cp -R $BOOTLOADER_DIR/files/* $RELEASE_DIR
+          fi
+          if [ -f "$BOOTLOADER_DIR"/release ]; then
+            . $BOOTLOADER_DIR/release
+          fi
         fi
         cp $ROOT/README* $RELEASE_DIR
         cp $ROOT/CHANGELOG* $RELEASE_DIR
         cp -R $CONFIG/release/openelec.ico $RELEASE_DIR
-        cp -R $CONFIG/release/INSTALL $RELEASE_DIR
         echo "$TARGET_VERSION" > $RELEASE_DIR/RELEASE
 
       mkdir -p $RELEASE_DIR/licenses