diff --git a/shim-install b/shim-install
index a23acdc..37fa9b1 100644
--- a/shim-install
+++ b/shim-install
@@ -12,6 +12,7 @@ sysconfdir="/etc"
 libdir="/usr/lib64"
 source_dir="$libdir/efi"
 grub_probe="`which grub2-probe`"
+grub_mkrelpath="`which grub2-mkrelpath`"
 self="`basename $0`"
 grub_cfg="/boot/grub2/grub.cfg"
 update_boot=no
@@ -232,7 +233,7 @@ cfg_fs_uuid=`"$grub_probe" --target=fs_uuid "$grub_cfg_dirname"`
 
 (cat << EOF
 search --fs-uuid --set=root ${cfg_fs_uuid}
-set prefix=(\${root})${grub_cfg_dirname}
+set prefix=(\${root})`${grub_mkrelpath} ${grub_cfg_dirname}`
 EOF
 echo "configfile \$prefix/${grub_cfg_basename}") \
 > "${efidir}/grub.cfg"
diff --git a/shim.changes b/shim.changes
index a98c01e..452e061 100644
--- a/shim.changes
+++ b/shim.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Mar  6 03:53:49 UTC 2014 - mchang@suse.com
+
+- shim-install: fix the $prefix to use grub2-mkrelpath for paths
+  on btrfs subvolume (bnc#866690).
+
 -------------------------------------------------------------------
 Tue Mar  4 04:19:05 UTC 2014 - glin@suse.com