diff --git a/shim-install b/shim-install
index bda78e1..48c2e32 100644
--- a/shim-install
+++ b/shim-install
@@ -237,6 +237,7 @@ fi
 make_grubcfg () {
 
 grub_cfg_dirname=`dirname $grub_cfg`
+grub_cfg_basename=`basename $grub_cfg`
 cfg_fs_uuid=`"$grub_probe" --target=fs_uuid "$grub_cfg_dirname"`
 
 if test "x$SUSE_BTRFS_SNAPSHOT_BOOTING" = "xtrue"; then
@@ -257,8 +258,7 @@ fi
 cat <<EOF
 search --fs-uuid --set=root ${cfg_fs_uuid}
 set prefix=(\${root})`${grub_mkrelpath} ${grub_cfg_dirname}`
-normal_exit
-normal
+source "\${prefix}/${grub_cfg_basename}"
 EOF
 
 }
diff --git a/shim.changes b/shim.changes
index 2fda73f..b5ee242 100644
--- a/shim.changes
+++ b/shim.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Aug 19 06:46:59 UTC 2016 - mchang@suse.com
+
+- shim-install : fix regression of password prompt (bsc#993764) 
+
 -------------------------------------------------------------------
 Fri Aug  5 02:53:54 UTC 2016 - glin@suse.com
 
diff --git a/shim.spec b/shim.spec
index 73a1f29..9f38e99 100644
--- a/shim.spec
+++ b/shim.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package shim
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed