diff --git a/srcpkgs/xfsprogs/patches/cross_compile.patch b/srcpkgs/xfsprogs/patches/cross_compile.patch
new file mode 100644
index 0000000000..6ecc03b8b2
--- /dev/null
+++ b/srcpkgs/xfsprogs/patches/cross_compile.patch
@@ -0,0 +1,22 @@
+--- libxfs/Makefile.orig	2014-09-08 15:26:46.443766634 +0200
++++ libxfs/Makefile	2014-09-08 15:27:31.618767187 +0200
+@@ -66,8 +66,8 @@
+ default: crc32selftest ltdepend $(LTLIBRARY)
+ 
+ crc32table.h: gen_crc32table.c
+-	@echo "    [CC]     gen_crc32table"
+-	$(Q) $(CC) $(CFLAGS) -o gen_crc32table $<
++	@echo "    [BUILD_CC]     gen_crc32table"
++	$(Q) $(BUILD_CC) $(BUILD_CFLAGS) -o gen_crc32table $<
+ 	@echo "    [GENERATE] $@"
+ 	$(Q) ./gen_crc32table > crc32table.h
+ 
+@@ -78,7 +78,7 @@
+ # disk.
+ crc32selftest: gen_crc32table.c crc32table.h crc32.c
+ 	@echo "    [TEST]    CRC32"
+-	$(Q) $(CC) $(CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@
++	$(Q) $(BUILD_CC) $(BUILD_CFLAGS) -I. -I../include -D CRC32_SELFTEST=1 crc32.c -o $@
+ 	$(Q) ./$@
+ 
+ include $(BUILDRULES)
diff --git a/srcpkgs/xfsprogs/template b/srcpkgs/xfsprogs/template
index 9527362e8e..7f273bb140 100644
--- a/srcpkgs/xfsprogs/template
+++ b/srcpkgs/xfsprogs/template
@@ -1,31 +1,27 @@
 # Template file for 'xfsprogs'
 pkgname=xfsprogs
-version=3.1.11
-revision=3
+version=3.2.1
+revision=1
+build_style=gnu-configure
+configure_args="--bindir=/usr/bin --sbindir=/usr/bin --enable-readline=yes --enable-blkid=yes --enable-lib64=no"
+hostmakedepends="libuuid-devel"
 makedepends="libuuid-devel libblkid-devel readline-devel>=6.3"
 replaces="xfsprogs-libs>=0"
 short_desc="Utilities for managing the XFS filesystem"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
 homepage="http://oss.sgi.com/projects/xfs/"
-distfiles="ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${version}.tar.gz"
-checksum=adf4980177b5c890c1ca86b9c0e3e4d69a3f95bfc01746844280c2393cf4d6be
+distfiles="ftp://oss.sgi.com/projects/xfs/cmd_tars/${pkgname}-${version}.tar.gz"
+checksum=83f8ea4c38fe9f42b9f12cd523519287a9695f2cf4f3064e9e9a839f71185767
 
-do_configure() {
+pre_configure() {
 	export DEBUG=-DNDEBUG
-	configure_args+=" --bindir=/usr/bin --sbindir=/usr/bin --enable-readline=yes --enable-blkid=yes --enable-lib64=no "
-	./configure ${configure_args}
-}
-
-do_build() {
-	make
 }
 
 do_install() {
 	make DIST_ROOT=${DESTDIR} install install-dev
 	# Remove unneeded stuff
 	rm -rf ${DESTDIR}/usr/share/doc
-	rm -f ${DESTDIR}/usr/share/man/man5/proj*
 	rm -f ${DESTDIR}/lib/*.{a,la}
 	rm -f ${DESTDIR}/usr/lib/*.{a,so}
 	# Move stuff to /usr.