diff --git a/ChangeLog b/ChangeLog
index 0362abd51..ca63b0e85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/fs/xfs.c (grub_xfs_iterate_dir): Take into account that
+	inopos might be unaligned.
+
 2011-01-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/disk/mdraid1x_linux.c (grub_mdraid_detect): Add missing
diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c
index 3d773856e..9f8dc28de 100644
--- a/grub-core/fs/xfs.c
+++ b/grub-core/fs/xfs.c
@@ -451,18 +451,27 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
 	for (i = 0; i < diro->inode.data.dir.dirhead.count; i++)
 	  {
 	    grub_uint64_t ino;
-	    void *inopos = (((char *) de)
+	    grub_uint8_t *inopos = (((grub_uint8_t *) de)
 			    + sizeof (struct grub_xfs_dir_entry)
 			    + de->len - 1);
 	    char name[de->len + 1];
 
+	    /* inopos might be unaligned.  */
 	    if (smallino)
-	      {
-		ino = grub_be_to_cpu32 (*(grub_uint32_t *) inopos);
-		ino = grub_cpu_to_be64 (ino);
-	      }
+	      ino = (((grub_uint32_t) inopos[0]) << 24)
+		| (((grub_uint32_t) inopos[1]) << 16)
+		| (((grub_uint32_t) inopos[2]) << 8)
+		| (((grub_uint32_t) inopos[3]) << 0);
 	    else
-	      ino = *(grub_uint64_t *) inopos;
+	      ino = (((grub_uint64_t) inopos[0]) << 56)
+		| (((grub_uint64_t) inopos[1]) << 48)
+		| (((grub_uint64_t) inopos[2]) << 40)
+		| (((grub_uint64_t) inopos[3]) << 32)
+		| (((grub_uint64_t) inopos[4]) << 24)
+		| (((grub_uint64_t) inopos[5]) << 16)
+		| (((grub_uint64_t) inopos[6]) << 8)
+		| (((grub_uint64_t) inopos[7]) << 0);
+	    ino = grub_cpu_to_be64 (ino);
 
 	    grub_memcpy (name, de->name, de->len);
 	    name[de->len] = '\0';