diff --git a/debian/build-efi-images b/debian/build-efi-images
index 157621140..54c642b57 100755
--- a/debian/build-efi-images
+++ b/debian/build-efi-images
@@ -47,10 +47,12 @@ echo 'normal (memdisk)/grub.cfg' >"$workdir/grub-bootstrap.cfg"
 
 # Skeleton configuration file which finds the real boot disk.
 cat >"$workdir/grub.cfg" <<EOF
-if ! search --file --set=root /.disk/info; then
-	search --file --set=root /.disk/mini-info
+if [ -z "\$prefix" -o ! -e "\$prefix" ]; then
+	if ! search --file --set=root /.disk/info; then
+		search --file --set=root /.disk/mini-info
+	fi
+	set prefix=(\$root)/boot/grub
 fi
-set prefix=(\$root)/boot/grub
 if [ -e \$prefix/$platform/grub.cfg ]; then
 	source \$prefix/$platform/grub.cfg
 else
@@ -71,8 +73,9 @@ CD_MODULES="
 GRUB_MODULES="$CD_MODULES lvm mdraid09 mdraid1x"
 
 "$grub_mkimage" -O "$platform" -o "$outdir/gcd$efi_name.efi" \
-	-d "$grub_core" -p /EFI/BOOT \
+	-d "$grub_core" \
 	-c "$workdir/grub-bootstrap.cfg" -m "$workdir/memdisk.fat" \
+	-p /boot/grub \
 	$CD_MODULES
 "$grub_mkimage" -O "$platform" -o "$outdir/grub$efi_name.efi" \
 	-d "$grub_core" -p /EFI/ubuntu $GRUB_MODULES
diff --git a/debian/changelog b/debian/changelog
index 04dc497a3..5f419201e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+grub2 (2.00-19) UNRELEASED; urgency=low
+
+  * Merge from Ubuntu:
+    - debian/build-efi-images: Where possible, make use of the device path
+      derived from the EFI Loaded Image Protocol to compute the prefix
+      (LP: #1097570).
+
+ -- Colin Watson <cjwatson@debian.org>  Wed, 18 Sep 2013 17:00:27 +0100
+
 grub2 (2.00-18) unstable; urgency=low
 
   * Add gettext module to signed UEFI images (LP: #1104627).