diff --git a/shim-install b/shim-install
index 32a9cca..250a3c9 100644
--- a/shim-install
+++ b/shim-install
@@ -180,6 +180,7 @@ if test "$clean" = "yes"; then
     rm -f "${efidir}/MokManager.efi"
     rm -f "${efidir}/grub.efi"
     rm -f "${efidir}/grub.cfg"
+    rm -f "${efidir}/boot.csv"
     efibootmgr="`which efibootmgr`"
     if test "$removable" = no && test -n "$bootloader_id" && test -n "$efibootmgr"; then
         # Delete old entries from the same distributor.
@@ -194,6 +195,7 @@ fi
 cp "${source_dir}/shim.efi" "${efidir}"
 cp "${source_dir}/MokManager.efi" "${efidir}"
 cp "${source_dir}/grub.efi" "${efidir}"
+echo "shim.efi,${bootloader_id}" | iconv -f ascii -t ucs2 > "${efidir}/boot.csv"
 
 grub_cfg_dirname=`dirname $grub_cfg`
 grub_cfg_basename=`basename $grub_cfg`
diff --git a/shim.changes b/shim.changes
index 980cab0..af8cd95 100644
--- a/shim.changes
+++ b/shim.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 25 07:17:54 UTC 2013 - glin@suse.com
+
+- Create boot.csv in ESP for fallback.efi to restore the boot entry
+
 -------------------------------------------------------------------
 Tue Sep 17 10:53:50 CEST 2013 - fcrozat@suse.com