diff --git a/srcpkgs/xfsprogs/template b/srcpkgs/xfsprogs/template
index 4d74e42cc6..b646b09071 100644
--- a/srcpkgs/xfsprogs/template
+++ b/srcpkgs/xfsprogs/template
@@ -1,14 +1,14 @@
 # Template file for 'xfsprogs'
 pkgname=xfsprogs
-version=3.0.3
+version=3.1.0
 distfiles="ftp://oss.sgi.com/projects/xfs/cmd_tars/$pkgname-$version.tar.gz"
 build_style=gnu_configure
-configure_args="--sbindir=/sbin --enable-readline=yes"
+configure_args="--sbindir=/sbin --enable-readline=yes --enable-lib64=no"
 make_install_target="DIST_ROOT=$XBPS_DESTDIR/$pkgname-$version
  install install-dev"
 short_desc="Utilities for managing the XFS filesystem"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=58b33a4b19ee85eb14d5c3908fa60ce822d1eccc89f1a9b7839171ab576c0d95
+checksum=932bdc49d3f39d908fcc65e480bbc0b9ffb4a6c61f2fc62f5c59394535dee8bd
 long_desc="
  A set of commands to use the XFS filesystem, including mkfs.xfs.
 
@@ -19,11 +19,14 @@ long_desc="
  to aid both performance and scalability."
 
 subpackages="$pkgname-libs $pkgname-devel"
-Add_dependency full glibc
-Add_dependency full libuuid
-Add_dependency full readline
-Add_dependency run  xfsprogs-libs
+Add_dependency run glibc
+Add_dependency run libuuid
+Add_dependency run readline
+Add_dependency run xfsprogs-libs
+Add_dependency build gawk
 Add_dependency build gettext
+Add_dependency build libuuid-devel
+Add_dependency build readline-devel
 
 pre_configure()
 {
diff --git a/srcpkgs/xfsprogs/xfsprogs-devel.template b/srcpkgs/xfsprogs/xfsprogs-devel.template
index aa94bd3f57..171ede6861 100644
--- a/srcpkgs/xfsprogs/xfsprogs-devel.template
+++ b/srcpkgs/xfsprogs/xfsprogs-devel.template
@@ -15,9 +15,7 @@ do_install()
 	mkdir -p ${DESTDIR}/usr/share/man
 
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/libexec/*.*a ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/libexec/*.so ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
 }
diff --git a/srcpkgs/xfsprogs/xfsprogs-libs.template b/srcpkgs/xfsprogs/xfsprogs-libs.template
index 865808ac72..ba3be2b535 100644
--- a/srcpkgs/xfsprogs/xfsprogs-libs.template
+++ b/srcpkgs/xfsprogs/xfsprogs-libs.template
@@ -10,5 +10,6 @@ Add_dependency run glibc
 do_install()
 {
 	mkdir -p ${DESTDIR}/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so.* ${DESTDIR}/lib
+	mv ${SRCPKGDESTDIR}/lib/*.so* ${DESTDIR}/lib
+	rm -f ${SRCPKGDESTDIR}/lib/*.*a
 }