diff --git a/debian/changelog b/debian/changelog
index 1ccb16ac..587b968d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ debian-cd (3.1.13-deb7u1) UNRELEASED; urgency=low
       checksums in bt-$type too
     + generate_di+k_list: update mips* kernel packages
     + update-cd: Check for file size on update CD/DVD generation
+    + parse_isolinux: Support grub menuentry shortcuts for UEFI boot menus.
+      Closes: #798908
 
  -- Steve McIntyre <93sam@debian.org>  Mon, 17 June 2013 15:44:32 +0100
 
diff --git a/tools/boot/wheezy/parse_isolinux b/tools/boot/wheezy/parse_isolinux
index 865e08ab..161ff09e 100755
--- a/tools/boot/wheezy/parse_isolinux
+++ b/tools/boot/wheezy/parse_isolinux
@@ -69,20 +69,21 @@ sub print_kernel {
     my $t = shift;
     my %k = %{$t};
     my $initrd;
+    my $hotkey = "";
 
-    # Only print 64-bit kernels
-    if ($k{"kernel"} =~ /amd/) {
+    if ($k{"label"} =~ m,\^(\S),) {
+	$hotkey = lc "--hotkey=$1 ";
 	$k{"label"} =~ s/\^//;
-	if ($k{"append"} =~ s? (initrd=\S+)??) {
-	    $initrd = $1;
-	    $initrd =~ s?^.*initrd=??;
-	}
-	print_indent "menuentry '$pre" . $k{"label"} . "' {\n";
-	print_indent "    set background_color=black\n";
-	print_indent "    linux    " . $k{"kernel"} . " " . $k{"append"} . "\n";
-	print_indent "    initrd   $initrd\n";
-	print_indent "}\n";
-    } 
+    }
+    if ($k{"append"} =~ s? (initrd=\S+)??) {
+	$initrd = $1;
+	$initrd =~ s?^.*initrd=??;
+    }
+    print_indent "menuentry $hotkey'$pre" . $k{"label"} . "' {\n";
+    print_indent "    set background_color=black\n";
+    print_indent "    linux    " . $k{"kernel"} . " " . $k{"append"} . "\n";
+    print_indent "    initrd   $initrd\n";
+    print_indent "}\n";
 }
 
 sub debug {