diff --git a/debian/changelog b/debian/changelog
index 9bea7352e..80419b67b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ grub2 (2.00-16) UNRELEASED; urgency=low
     missing LVM commands.
   * Backport from upstream:
     - Move @itemize after @subsection to satisfy texinfo-5.1.
+    - grub-mkconfig: Fix detection of Emacs autosave files.
 
  -- Colin Watson <cjwatson@debian.org>  Sun, 11 Aug 2013 12:12:54 +0100
 
diff --git a/debian/patches/mkconfig_emacs_autosave.patch b/debian/patches/mkconfig_emacs_autosave.patch
new file mode 100644
index 000000000..b63c0cb9c
--- /dev/null
+++ b/debian/patches/mkconfig_emacs_autosave.patch
@@ -0,0 +1,20 @@
+Description: Fix detection of Emacs autosave files
+Author: Colin Watson <cjwatson@ubuntu.com>
+Origin: upstream, http://bazaar.launchpad.net/~vcs-imports/grub/grub2-bzr/revision/5089
+Forwarded: not-needed
+Applied-Upstream: http://bazaar.launchpad.net/~vcs-imports/grub/grub2-bzr/revision/5089
+Last-Update: 2013-08-11
+
+Index: b/util/grub-mkconfig.in
+===================================================================
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -253,7 +253,7 @@
+     # emacsen backup files. FIXME: support other editors
+     *~) ;;
+     # emacsen autosave files. FIXME: support other editors
+-    \#*\#) ;;
++    */\#*\#) ;;
+     *)
+       if grub_file_is_not_garbage "$i" && test -x "$i" ; then
+         echo
diff --git a/debian/patches/series b/debian/patches/series
index d8144937d..5fe66e66e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -48,3 +48,4 @@ os_prober_efi.patch
 acpihalt_improvements.patch
 script_check_no_commands.patch
 texinfo_ordering.patch
+mkconfig_emacs_autosave.patch
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 6d8b69b9e..73dae83c8 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -253,7 +253,7 @@ for i in ${grub_mkconfig_dir}/* ; do
     # emacsen backup files. FIXME: support other editors
     *~) ;;
     # emacsen autosave files. FIXME: support other editors
-    \#*\#) ;;
+    */\#*\#) ;;
     *)
       if grub_file_is_not_garbage "$i" && test -x "$i" ; then
         echo