diff --git a/ChangeLog b/ChangeLog
index e04d27816..0658222dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-11  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-mkconfig.in: Fix detection of Emacs autosave files.
+
 2013-08-08  Vladimir Testov  <vladimir.testov@rosalab.ru>
 
 	* docs/grub.texi: Introduce terminal window position options:
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 8decc1d84..e720b2a13 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -240,7 +240,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