diff --git a/ChangeLog b/ChangeLog
index f8041d05e..bda8fb46f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-31  Anton Blanchard  <anton@samba.org>
+
+	* grub-core/fs/iso9660.c (grub_iso9660_iterate_dir): Do not byteswap
+	8 bit values.
+
 2012-03-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-install.in: Fix nvram call for PreP.
diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c
index 2cff864ff..394fe4486 100644
--- a/grub-core/fs/iso9660.c
+++ b/grub-core/fs/iso9660.c
@@ -620,7 +620,7 @@ grub_iso9660_iterate_dir (grub_fshelp_node_t dir,
 	  unsigned int pos = 1;
 
 	  /* The symlink is not stored as a POSIX symlink, translate it.  */
-	  while (pos + sizeof (*entry) < grub_le_to_cpu32 (entry->len))
+	  while (pos + sizeof (*entry) < entry->len)
 	    {
 	      /* The current position is the `Component Flag'.  */
 	      switch (entry->data[pos] & 30)