diff --git a/packages/sysutils/busybox/scripts/getedid b/packages/sysutils/busybox/scripts/getedid
index 72074a5a4d..f922b7b87c 100755
--- a/packages/sysutils/busybox/scripts/getedid
+++ b/packages/sysutils/busybox/scripts/getedid
@@ -114,7 +114,7 @@ sys_reboot() {
 # check syslinux.cfg and/or extlinux.conf
 check_file() {
   # check boot system
-  if [ -d /sys/firmware/efi ]; then
+  if [ -d /sys/firmware/efi -a -f /flash/EFI/BOOT/syslinux.cfg ] ; then
     sys_boot="UEFI"
     sys_path="/flash/EFI/BOOT"
   else
diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init
index c8568cfa12..a06995c3dc 100755
--- a/packages/sysutils/busybox/scripts/init
+++ b/packages/sysutils/busybox/scripts/init
@@ -719,7 +719,7 @@
 
           mount -o remount,rw /flash
           sed -i "s/^DEFAULT .*/DEFAULT $SYSLINUX_DEFAULT/" /flash/syslinux.cfg
-          [ -f /flash/EFI/BOOT/syslinux.cfg ] && cp /flash/syslinux.cfg /flash/EFI/BOOT/syslinux.cfg
+          rm -f /flash/EFI/BOOT/syslinux.cfg
           mount -o remount,ro /flash
         fi
       fi
diff --git a/packages/tools/installer/scripts/installer b/packages/tools/installer/scripts/installer
index 86485f0983..5946b9ebfe 100755
--- a/packages/tools/installer/scripts/installer
+++ b/packages/tools/installer/scripts/installer
@@ -279,7 +279,6 @@ do_install_quick() {
         if [ "$UEFI" = "1" ]; then
           mv $TMPDIR/part1/extlinux.conf $TMPDIR/part1/syslinux.cfg
           mkdir -p $TMPDIR/part1/EFI/BOOT
-          cp $TMPDIR/part1/syslinux.cfg $TMPDIR/part1/EFI/BOOT
           cp /usr/share/syslinux/bootx64.efi $TMPDIR/part1/EFI/BOOT
           cp /usr/share/syslinux/ldlinux.e64 $TMPDIR/part1/EFI/BOOT
           cp $TMPDIR/part1/grub.cfg $TMPDIR/part1/EFI/BOOT
diff --git a/scripts/mkimage b/scripts/mkimage
index 95344f4ce3..71ab8de10d 100755
--- a/scripts/mkimage
+++ b/scripts/mkimage
@@ -189,7 +189,6 @@ EOF
     mcopy $TOOLCHAIN/share/syslinux/bootx64.efi ::/EFI/BOOT
     mcopy $TOOLCHAIN/share/syslinux/ldlinux.e64 ::/EFI/BOOT
     mcopy $TOOLCHAIN/share/grub/bootia32.efi ::/EFI/BOOT
-    mcopy "$LE_TMP"/syslinux.cfg ::/EFI/BOOT
     mcopy "$LE_TMP"/grub.cfg ::/EFI/BOOT
 elif [ "$BOOTLOADER" = "bcm2835-bootloader" ]; then
   # create bootloader configuration
@@ -312,7 +311,6 @@ fi # bootloader
     sed -i "/DEFAULT/ s/installer/run/" "$LE_TMP"/syslinux.cfg
     sed -i "/set default=/s/\"Installer\"/\"Run\"/" "$LE_TMP"/grub.cfg
     # FIXME: an unalias should work here, but it does not; call mcopy directly
-    $TOOLCHAIN/bin/mcopy -i $LE_TMP/part1.fat -o "$LE_TMP"/syslinux.cfg ::/EFI/BOOT
     $TOOLCHAIN/bin/mcopy -i $LE_TMP/part1.fat -o "$LE_TMP"/syslinux.cfg ::
     $TOOLCHAIN/bin/mcopy -i $LE_TMP/part1.fat -o "$LE_TMP"/grub.cfg ::/EFI/BOOT
     $TOOLCHAIN/bin/mcopy -i $LE_TMP/part1.fat -o "$LE_TMP"/grub.cfg ::