diff --git a/ChangeLog b/ChangeLog
index 86f667f50..778c824f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-03  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/fs/xfs.c (GRUB_XFS_EXTENT_BLOCK): Fix bitmask.
+
 2012-05-03  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/fs/zfs/zfs.c (nvlist_find_value): Fix return value.
diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c
index b86e2ed0a..a3503e652 100644
--- a/grub-core/fs/xfs.c
+++ b/grub-core/fs/xfs.c
@@ -216,7 +216,7 @@ GRUB_XFS_EXTENT_BLOCK (grub_xfs_extent *exts, int ex)
 static inline grub_uint64_t
 GRUB_XFS_EXTENT_SIZE (grub_xfs_extent *exts, int ex)
 {
-  return (grub_be_to_cpu32 (exts[ex][3]) & ((1 << 20) - 1));
+  return (grub_be_to_cpu32 (exts[ex][3]) & ((1 << 21) - 1));
 }
 
 static inline int