diff --git a/shim-install b/shim-install
index cfe6d31..c4daf80 100644
--- a/shim-install
+++ b/shim-install
@@ -28,7 +28,7 @@ def_boot_efi=
 [ ! -r /usr/etc/default/shim ] || . /usr/etc/default/shim
 [ ! -r /etc/default/shim ] || . /etc/default/shim
 
-if [ -z "$def_shim_efi" ] ; then
+if [ -z "$def_shim_efi" -o ! -e ${source_dir}/${def_shim_efi} ] ; then
 	def_shim_efi="shim.efi"
 fi
 
diff --git a/shim.changes b/shim.changes
index 3eeaed5..14572e9 100644
--- a/shim.changes
+++ b/shim.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jun  4 07:02:03 UTC 2021 - Gary Ching-Pang Lin <glin@suse.com>
+
+- shim-install: reset def_shim_efi to "shim.efi" if the given
+  file doesn't exist
+
 -------------------------------------------------------------------
 Wed May 19 01:07:43 UTC 2021 - Gary Ching-Pang Lin <glin@suse.com>