diff --git a/ChangeLog b/ChangeLog
index 936e64c45..0928450ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-12-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/fs/jfs.c (grub_jfs_getent): Handle UTF16 endianness.
+
 2011-12-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/fs/hfs.c (grub_hfs_find_node): Handle unaligned keys.
diff --git a/grub-core/fs/jfs.c b/grub-core/fs/jfs.c
index 3554803cb..72d6fe4c1 100644
--- a/grub-core/fs/jfs.c
+++ b/grub-core/fs/jfs.c
@@ -490,7 +490,7 @@ grub_jfs_getent (struct grub_jfs_diropen *diro)
   void addstr (grub_uint16_t *name, int ulen)
     {
       while (ulen--)
-	filename[strpos++] = *(name++);
+	filename[strpos++] = grub_le_to_cpu16 (*(name++));
     }
 
   /* The last node, read in more.  */