diff --git a/ChangeLog b/ChangeLog
index 1d9583c18..2c9dd76b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-14  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* grub-core/fs/ext2.c (grub_ext2_iterate_dir): Ignore entries with
+	direct.inode = 0.
+
 2012-01-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/lib/posix_wrap/wctype.h (CHARCLASS_NAME_MAX): New define.
diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c
index 51f3a658f..e440e0397 100644
--- a/grub-core/fs/ext2.c
+++ b/grub-core/fs/ext2.c
@@ -685,7 +685,7 @@ grub_ext2_iterate_dir (grub_fshelp_node_t dir,
       if (dirent.direntlen == 0)
         return 0;
 
-      if (dirent.namelen != 0)
+      if (dirent.inode != 0 && dirent.namelen != 0)
 	{
 	  char filename[dirent.namelen + 1];
 	  struct grub_fshelp_node *fdiro;