diff --git a/ChangeLog b/ChangeLog
index 3eff5f884..57209d1f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-02  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-mkconfig_lib.in (grub_file_is_not_garbage): Sometimes
+	grub.d/README accidentally ends up executable for one reason or
+	another.  Ignore it.
+
 2010-07-02  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* partmap/gpt.c (MAX_SECTOR_LOG): New definition.
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index 14ea1842f..bdd2b8c6f 100644
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -128,6 +128,7 @@ grub_file_is_not_garbage ()
   if test -f "$1" ; then
     case "$1" in
       *.dpkg-*) return 1 ;; # debian dpkg
+      README*)  return 1 ;; # documentation
     esac
   else
     return 1