diff --git a/grub-fedora-9.patch b/grub-fedora-9.patch
index 18df456..c6caff2 100644
--- a/grub-fedora-9.patch
+++ b/grub-fedora-9.patch
@@ -38632,7 +38632,7 @@ index a116717..652e784 100644
      }
    
 diff --git a/stage2/fsys_xfs.c b/stage2/fsys_xfs.c
-index 76c4c13..80c2383 100644
+index 76c4c13..1c01c3b 100644
 --- a/stage2/fsys_xfs.c
 +++ b/stage2/fsys_xfs.c
 @@ -97,8 +97,8 @@ ino2offset (xfs_ino_t ino)
@@ -38668,6 +38668,22 @@ index 76c4c13..80c2383 100644
  le64 (xfs_uint64_t x)
  {
  	xfs_uint32_t h = x >> 32;
+@@ -187,12 +187,12 @@ fsb2daddr (xfs_fsblock_t fsbno)
+ }
+ 
+ #undef offsetof
+-#define offsetof(t,m)	((int)&(((t *)0)->m))
++#define offsetof(t,m) __builtin_offsetof(t, m)
+ 
+-static inline int
++static inline xfs_uint64_t
+ btroot_maxrecs (void)
+ {
+-	int tmp = icore.di_forkoff ? (icore.di_forkoff << 3) : xfs.isize;
++	xfs_uint64_t tmp = icore.di_forkoff ? (icore.di_forkoff << 3) : xfs.isize;
+ 
+ 	return (tmp - sizeof(xfs_bmdr_block_t) - offsetof(xfs_dinode_t, di_u)) /
+ 		(sizeof (xfs_bmbt_key_t) + sizeof (xfs_bmbt_ptr_t));
 @@ -334,7 +334,7 @@ next_dentry (xfs_ino_t *ino)
  {
  	int namelen = 1;
diff --git a/grub.spec b/grub.spec
index 4be5784..44d1082 100644
--- a/grub.spec
+++ b/grub.spec
@@ -1,13 +1,13 @@
 Name: grub
 Version: 0.97
-Release: 23%{?dist}
+Release: 24%{?dist}
 Summary: GRUB - the Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPLv2+
 
-ExclusiveArch: i386 x86_64
+ExclusiveArch: i386 x86_64 ia64
 BuildRequires: binutils >= 2.9.1.0.23, ncurses-devel, ncurses-static, texinfo
-BuildRequires: autoconf /usr/lib/crt1.o automake
+BuildRequires: autoconf /usr/lib/crt1.o automake gnu-efi
 PreReq: /sbin/install-info
 Requires: mktemp
 Requires: /usr/bin/cmp
@@ -87,6 +87,9 @@ fi
 #/sbin/grub-efi
 
 %changelog
+* Wed Feb 27 2008 Peter Jones <pjones@redhat.com> - 0.97-24
+- Fix build of xfs code on amd64.
+
 * Wed Feb 27 2008 Peter Jones <pjones@redhat.com> - 0.97-23
 - Enable EFI on i386, update to newest git head.