diff --git a/grub2-xen-pv-firmware.cfg b/grub2-xen-pv-firmware.cfg
index 788ed86..f793389 100644
--- a/grub2-xen-pv-firmware.cfg
+++ b/grub2-xen-pv-firmware.cfg
@@ -41,20 +41,25 @@ if [ -n "${suse_cddev_content}" -a -n "${suse_cddev_product}" -a "${suse_cddev_c
     set suse_cddev="${suse_cddev_content}"
 fi
 
-hdcfg_list="/boot/grub2/grub.cfg \
+set hdcfg_list="\
+/boot/grub2/grub.cfg \
 /@/boot/grub2/grub.cfg \
 /@/.snapshots/1/snapshot/boot/grub2/grub.cfg \
 /.snapshots/1/snapshot/boot/grub2/grub.cfg \
-/grub2/grub.cfg"
+/grub2/grub.cfg\
+"
 
-hdlst_list="/boot/grub/menu.lst \
-/grub/menu.lst"
+set hdlst_list="\
+/boot/grub/menu.lst \
+/grub/menu.lst\
+"
 
 for c in ${hdcfg_list}; do
     if search -s hddev -f "${c}"; then
-        menuentry "${hddev} Boot From Hard Disk ($c)" {
-            set root="${hddev}"
-            configfile "${c}"
+        menuentry "${hddev} Boot From Hard Disk (${c})" "${hddev}" "${c}" {
+            set root="${2}"
+            set cfg="${3}"
+            configfile "${cfg}"
         }
         break
     fi
@@ -62,9 +67,10 @@ done
 
 for c in ${hdlst_list}; do
     if search -s hddev -f "${c}"; then
-        menuentry "${hddev} Boot From Hard Disk (${c})" {
-            set root="${hddev}"
-            legacy_configfile "${c}"
+        menuentry "${hddev} Boot From Hard Disk (${c})" "${hddev}" "${c}" {
+            set root="${2}"
+            set cfg="${3}"
+            legacy_configfile "${cfg}"
         }
         break
     fi
diff --git a/grub2.changes b/grub2.changes
index 55ca0ac..0c87528 100644
--- a/grub2.changes
+++ b/grub2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Dec 17 11:04:06 UTC 2015 - olaf@aepfle.de
+
+- grub2-xen-pv-firmware.cfg: fix hd boot (boo#926795)
+
 -------------------------------------------------------------------
 Wed Dec 16 05:04:37 UTC 2015 - arvidjaar@gmail.com