diff --git a/ChangeLog b/ChangeLog
index ad7dea7c8..c84aa30aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-05  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-mkconfig_lib.in (grub_file_is_not_garbage): Return 1 for
+	*/README* as well as README*.
+	Reported by: Axel Beckert.
+
 2011-08-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/mips/loongson/init.c (grub_machine_init): Handle the
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index 901b5752f..a453a6bb5 100644
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -157,7 +157,7 @@ grub_file_is_not_garbage ()
   if test -f "$1" ; then
     case "$1" in
       *.dpkg-*) return 1 ;; # debian dpkg
-      README*)  return 1 ;; # documentation
+      README*|*/README*)  return 1 ;; # documentation
     esac
   else
     return 1