diff --git a/.cvsignore b/.cvsignore
index a6e2fee..c85ac9f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xfsprogs_2.8.18-1.tar.gz
+xfsprogs_2.8.21-1.tar.gz
diff --git a/sources b/sources
index 85a5574..d734f2f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6ce9e198cc79ebec6f6fb1f34ffa7709  xfsprogs_2.8.18-1.tar.gz
+a40b7d656c9ddb775c3f221433cbf08a  xfsprogs_2.8.21-1.tar.gz
diff --git a/xfsprogs-2.8.20-fix-type-test.patch b/xfsprogs-2.8.20-fix-type-test.patch
new file mode 100644
index 0000000..d61ea7e
--- /dev/null
+++ b/xfsprogs-2.8.20-fix-type-test.patch
@@ -0,0 +1,26 @@
+Index: xfsprogs-2.8.20/aclocal.m4
+===================================================================
+--- xfsprogs-2.8.20.orig/aclocal.m4
++++ xfsprogs-2.8.20/aclocal.m4
+@@ -317,7 +317,7 @@ AC_DEFUN([AC_TYPE_U32],
+ #include <stddef.h>
+     ], [
+          __u32  u32;
+-    ], AC_DEFINE(HAVE___U32_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
++    ], AC_DEFINE(HAVE___U32) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
+   ])
+ 
+ # 
+Index: xfsprogs-2.8.20/m4/package_types.m4
+===================================================================
+--- xfsprogs-2.8.20.orig/m4/package_types.m4
++++ xfsprogs-2.8.20/m4/package_types.m4
+@@ -37,7 +37,7 @@ AC_DEFUN([AC_TYPE_U32],
+ #include <stddef.h>
+     ], [
+          __u32  u32;
+-    ], AC_DEFINE(HAVE___U32_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
++    ], AC_DEFINE(HAVE___U32) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
+   ])
+ 
+ # 
diff --git a/xfsprogs.spec b/xfsprogs.spec
index 116783d..4cc2315 100644
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -1,7 +1,7 @@
 Summary: Utilities for managing the XFS filesystem
 Name: xfsprogs
-Version: 2.8.18
-Release: 3%{?dist}
+Version: 2.8.21
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://oss.sgi.com/projects/xfs/
@@ -15,6 +15,8 @@ Provides: xfs-cmds
 Obsoletes: xfs-cmds <= %{version}
 Conflicts: xfsdump < 2.0.0
 
+Patch1: xfsprogs-2.8.20-fix-type-test.patch
+
 %description
 A set of commands to use the XFS filesystem, including mkfs.xfs.
 
@@ -44,6 +46,8 @@ also want to install xfsprogs.
 
 %prep
 %setup -q
+# Fix autoconf u32 test for ppc64
+%patch1 -p1 -b .type_test
 #
 %build
 # xfsprogs does not ship ./configure
@@ -107,6 +111,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Thu Jul  6 2007 Eric Sandeen <sandeen@redhat.com> 2.8.21-1
+- Upgrade to xfsprogs 2.8.21, lazy sb counters enabled,
+  xfs_quota fix (#236746)
+
+* Thu May 31 2007 Eric Sandeen <sandeen@redhat.com> 2.8.20-2
+- Fix ppc64 build... again
+
+* Fri May 25 2007 Eric Sandeen <sandeen@redhat.com> 2.8.20-1
+- Upgrade to xfsprogs 2.8.20, several xfs_repair fixes
+
 * Tue Mar 06 2007 Miroslav Lichvar <mlichvar@redhat.com> 2.8.18-3
 - Remove libtermcap-devel from BuildRequires