diff --git a/bootfiles/bootinst.sh b/bootfiles/bootinst.sh
index 0106c61..748be9d 100755
--- a/bootfiles/bootinst.sh
+++ b/bootfiles/bootinst.sh
@@ -40,5 +40,13 @@ if [ "$DEV" != "$PART" ]; then
    ) | fdisk $DEV >/dev/null 2>&1
 fi
 
+# Now to be able to boot from most of UEFI devices
+EFIDIR="$BOOT/EFI/efi/boot"
+mkdir -p "$EFIDIR"
+cp efi-files/* "$EFIDIR"
+
+# I didn't renamed the binary in place so it could be updated more easily
+mv "$EFIDIR/syslinux.efi" "$EFIDIR/bootx64.efi"
+
 echo "Boot installation finished."
 cd "$CWD"
diff --git a/bootfiles/efi-files/cat.c32 b/bootfiles/efi-files/cat.c32
new file mode 100644
index 0000000..1969e9f
Binary files /dev/null and b/bootfiles/efi-files/cat.c32 differ
diff --git a/bootfiles/efi-files/chain.c32 b/bootfiles/efi-files/chain.c32
new file mode 100644
index 0000000..511658f
Binary files /dev/null and b/bootfiles/efi-files/chain.c32 differ
diff --git a/bootfiles/efi-files/cmd.c32 b/bootfiles/efi-files/cmd.c32
new file mode 100644
index 0000000..83ec2a5
Binary files /dev/null and b/bootfiles/efi-files/cmd.c32 differ
diff --git a/bootfiles/efi-files/cmenu.c32 b/bootfiles/efi-files/cmenu.c32
new file mode 100644
index 0000000..99d5c9c
Binary files /dev/null and b/bootfiles/efi-files/cmenu.c32 differ
diff --git a/bootfiles/efi-files/config.c32 b/bootfiles/efi-files/config.c32
new file mode 100644
index 0000000..59650f0
Binary files /dev/null and b/bootfiles/efi-files/config.c32 differ
diff --git a/bootfiles/efi-files/cptime.c32 b/bootfiles/efi-files/cptime.c32
new file mode 100644
index 0000000..9b14bb2
Binary files /dev/null and b/bootfiles/efi-files/cptime.c32 differ
diff --git a/bootfiles/efi-files/cpu.c32 b/bootfiles/efi-files/cpu.c32
new file mode 100644
index 0000000..f3d6f79
Binary files /dev/null and b/bootfiles/efi-files/cpu.c32 differ
diff --git a/bootfiles/efi-files/cpuid.c32 b/bootfiles/efi-files/cpuid.c32
new file mode 100644
index 0000000..2492985
Binary files /dev/null and b/bootfiles/efi-files/cpuid.c32 differ
diff --git a/bootfiles/efi-files/cpuidtest.c32 b/bootfiles/efi-files/cpuidtest.c32
new file mode 100644
index 0000000..e93dc4c
Binary files /dev/null and b/bootfiles/efi-files/cpuidtest.c32 differ
diff --git a/bootfiles/efi-files/debug.c32 b/bootfiles/efi-files/debug.c32
new file mode 100644
index 0000000..22c1824
Binary files /dev/null and b/bootfiles/efi-files/debug.c32 differ
diff --git a/bootfiles/efi-files/dhcp.c32 b/bootfiles/efi-files/dhcp.c32
new file mode 100644
index 0000000..9f85b47
Binary files /dev/null and b/bootfiles/efi-files/dhcp.c32 differ
diff --git a/bootfiles/efi-files/dir.c32 b/bootfiles/efi-files/dir.c32
new file mode 100644
index 0000000..46a132b
Binary files /dev/null and b/bootfiles/efi-files/dir.c32 differ
diff --git a/bootfiles/efi-files/dmi.c32 b/bootfiles/efi-files/dmi.c32
new file mode 100644
index 0000000..521732f
Binary files /dev/null and b/bootfiles/efi-files/dmi.c32 differ
diff --git a/bootfiles/efi-files/dmitest.c32 b/bootfiles/efi-files/dmitest.c32
new file mode 100644
index 0000000..1f85c16
Binary files /dev/null and b/bootfiles/efi-files/dmitest.c32 differ
diff --git a/bootfiles/efi-files/gfxboot.c32 b/bootfiles/efi-files/gfxboot.c32
new file mode 100644
index 0000000..0a8ba63
Binary files /dev/null and b/bootfiles/efi-files/gfxboot.c32 differ
diff --git a/bootfiles/efi-files/hdt.c32 b/bootfiles/efi-files/hdt.c32
new file mode 100644
index 0000000..6997233
Binary files /dev/null and b/bootfiles/efi-files/hdt.c32 differ
diff --git a/bootfiles/efi-files/hexdump.c32 b/bootfiles/efi-files/hexdump.c32
new file mode 100644
index 0000000..c54580f
Binary files /dev/null and b/bootfiles/efi-files/hexdump.c32 differ
diff --git a/bootfiles/efi-files/host.c32 b/bootfiles/efi-files/host.c32
new file mode 100644
index 0000000..d4edc26
Binary files /dev/null and b/bootfiles/efi-files/host.c32 differ
diff --git a/bootfiles/efi-files/ifcpu.c32 b/bootfiles/efi-files/ifcpu.c32
new file mode 100644
index 0000000..857ec84
Binary files /dev/null and b/bootfiles/efi-files/ifcpu.c32 differ
diff --git a/bootfiles/efi-files/ifcpu64.c32 b/bootfiles/efi-files/ifcpu64.c32
new file mode 100644
index 0000000..b866903
Binary files /dev/null and b/bootfiles/efi-files/ifcpu64.c32 differ
diff --git a/bootfiles/efi-files/ldlinux.e64 b/bootfiles/efi-files/ldlinux.e64
new file mode 100644
index 0000000..fac6464
Binary files /dev/null and b/bootfiles/efi-files/ldlinux.e64 differ
diff --git a/bootfiles/efi-files/lfs.c32 b/bootfiles/efi-files/lfs.c32
new file mode 100644
index 0000000..690b6ce
Binary files /dev/null and b/bootfiles/efi-files/lfs.c32 differ
diff --git a/bootfiles/efi-files/libcom32.c32 b/bootfiles/efi-files/libcom32.c32
new file mode 100644
index 0000000..9fdccd4
Binary files /dev/null and b/bootfiles/efi-files/libcom32.c32 differ
diff --git a/bootfiles/efi-files/libgpl.c32 b/bootfiles/efi-files/libgpl.c32
new file mode 100644
index 0000000..cabeee5
Binary files /dev/null and b/bootfiles/efi-files/libgpl.c32 differ
diff --git a/bootfiles/efi-files/liblua.c32 b/bootfiles/efi-files/liblua.c32
new file mode 100644
index 0000000..51cd922
Binary files /dev/null and b/bootfiles/efi-files/liblua.c32 differ
diff --git a/bootfiles/efi-files/libmenu.c32 b/bootfiles/efi-files/libmenu.c32
new file mode 100644
index 0000000..1a67dfd
Binary files /dev/null and b/bootfiles/efi-files/libmenu.c32 differ
diff --git a/bootfiles/efi-files/libutil.c32 b/bootfiles/efi-files/libutil.c32
new file mode 100644
index 0000000..9069f6c
Binary files /dev/null and b/bootfiles/efi-files/libutil.c32 differ
diff --git a/bootfiles/efi-files/linux.c32 b/bootfiles/efi-files/linux.c32
new file mode 100644
index 0000000..8a2ff18
Binary files /dev/null and b/bootfiles/efi-files/linux.c32 differ
diff --git a/bootfiles/efi-files/ls.c32 b/bootfiles/efi-files/ls.c32
new file mode 100644
index 0000000..15a3339
Binary files /dev/null and b/bootfiles/efi-files/ls.c32 differ
diff --git a/bootfiles/efi-files/lua.c32 b/bootfiles/efi-files/lua.c32
new file mode 100644
index 0000000..681145a
Binary files /dev/null and b/bootfiles/efi-files/lua.c32 differ
diff --git a/bootfiles/efi-files/mboot.c32 b/bootfiles/efi-files/mboot.c32
new file mode 100644
index 0000000..78fdfe0
Binary files /dev/null and b/bootfiles/efi-files/mboot.c32 differ
diff --git a/bootfiles/efi-files/meminfo.c32 b/bootfiles/efi-files/meminfo.c32
new file mode 100644
index 0000000..22c92b2
Binary files /dev/null and b/bootfiles/efi-files/meminfo.c32 differ
diff --git a/bootfiles/efi-files/menu.c32 b/bootfiles/efi-files/menu.c32
new file mode 100644
index 0000000..8353385
Binary files /dev/null and b/bootfiles/efi-files/menu.c32 differ
diff --git a/bootfiles/efi-files/pci.c32 b/bootfiles/efi-files/pci.c32
new file mode 100644
index 0000000..87fbe05
Binary files /dev/null and b/bootfiles/efi-files/pci.c32 differ
diff --git a/bootfiles/efi-files/pwd.c32 b/bootfiles/efi-files/pwd.c32
new file mode 100644
index 0000000..e2e4b96
Binary files /dev/null and b/bootfiles/efi-files/pwd.c32 differ
diff --git a/bootfiles/efi-files/reboot.c32 b/bootfiles/efi-files/reboot.c32
new file mode 100644
index 0000000..15d5f40
Binary files /dev/null and b/bootfiles/efi-files/reboot.c32 differ
diff --git a/bootfiles/efi-files/rosh.c32 b/bootfiles/efi-files/rosh.c32
new file mode 100644
index 0000000..7fa4002
Binary files /dev/null and b/bootfiles/efi-files/rosh.c32 differ
diff --git a/bootfiles/efi-files/sysdump.c32 b/bootfiles/efi-files/sysdump.c32
new file mode 100644
index 0000000..c62e252
Binary files /dev/null and b/bootfiles/efi-files/sysdump.c32 differ
diff --git a/bootfiles/efi-files/syslinux.c32 b/bootfiles/efi-files/syslinux.c32
new file mode 100644
index 0000000..fca64c0
Binary files /dev/null and b/bootfiles/efi-files/syslinux.c32 differ
diff --git a/bootfiles/efi-files/syslinux.efi b/bootfiles/efi-files/syslinux.efi
new file mode 100755
index 0000000..c169973
Binary files /dev/null and b/bootfiles/efi-files/syslinux.efi differ
diff --git a/bootfiles/efi-files/vesa.c32 b/bootfiles/efi-files/vesa.c32
new file mode 100644
index 0000000..fe13172
Binary files /dev/null and b/bootfiles/efi-files/vesa.c32 differ
diff --git a/bootfiles/efi-files/vesamenu.c32 b/bootfiles/efi-files/vesamenu.c32
new file mode 100644
index 0000000..3e99d0e
Binary files /dev/null and b/bootfiles/efi-files/vesamenu.c32 differ
diff --git a/bootfiles/efi-files/vpdtest.c32 b/bootfiles/efi-files/vpdtest.c32
new file mode 100644
index 0000000..01d4a34
Binary files /dev/null and b/bootfiles/efi-files/vpdtest.c32 differ
diff --git a/bootfiles/efi-files/whichsys.c32 b/bootfiles/efi-files/whichsys.c32
new file mode 100644
index 0000000..fd31895
Binary files /dev/null and b/bootfiles/efi-files/whichsys.c32 differ
diff --git a/bootfiles/efi-files/zzjson.c32 b/bootfiles/efi-files/zzjson.c32
new file mode 100644
index 0000000..b58949a
Binary files /dev/null and b/bootfiles/efi-files/zzjson.c32 differ