diff --git a/srcpkgs/xfsprogs/template b/srcpkgs/xfsprogs/template
index 1a174cb7fbe..a89037578bd 100644
--- a/srcpkgs/xfsprogs/template
+++ b/srcpkgs/xfsprogs/template
@@ -1,12 +1,12 @@
 # Template file for 'xfsprogs'
 pkgname=xfsprogs
-version=3.1.5
-#distfiles="ftp://oss.sgi.com/projects/xfs/cmd_tars/$pkgname-$version.tar.gz"
-distfiles="http://ftp.gwdg.de/pub/linux/misc/xfs/xfs/previous/$pkgname-$version.tar.gz"
-revision=1
+version=3.1.6
+homepage="http://oss.sgi.com/projects/xfs/"
+distfiles="http://ftp.archlinux.org/other/xfsprogs/$pkgname-$version.tar.gz"
 short_desc="Utilities for managing the XFS filesystem"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=13347de43203c4575bca7a72efb344c7caf8a86fa216bbd69bf1980f2fb2f37f
+license="LGPL-2.1"
+checksum=a34ff643fda76f97a8e0842ae87cc86e70fb801f0388f5265e46d2ec3a0f20aa
 long_desc="
  A set of commands to use the XFS filesystem, including mkfs.xfs.
 
@@ -19,21 +19,21 @@ long_desc="
 disable_parallel_build=yes
 subpackages="$pkgname-libs $pkgname-devel"
 
-
 Add_dependency build gawk
 Add_dependency build gettext
 Add_dependency build libuuid-devel
 Add_dependency build libblkid-devel
 Add_dependency build readline-devel
 
-do_build()
-{
+do_build() {
 	export DEBUG=-DNDEBUG
 	./configure --enable-readline=yes --enable-blkid=yes --enable-lib64=no
 	make ${makejobs}
 }
 
-do_install()
-{
+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*
 }
diff --git a/srcpkgs/xfsprogs/xfsprogs-libs.template b/srcpkgs/xfsprogs/xfsprogs-libs.template
index 31e6eed5bf7..1115e2b9584 100644
--- a/srcpkgs/xfsprogs/xfsprogs-libs.template
+++ b/srcpkgs/xfsprogs/xfsprogs-libs.template
@@ -1,12 +1,10 @@
 # Template file for 'xfsprogs-libs'.
 #
-revision=1
 short_desc="${short_desc} (shared libraries)"
 long_desc="${long_desc}
 
  This package contains the shared libraries."
 
-
 do_install()
 {
 	mkdir -p ${DESTDIR}/lib