diff --git a/srcpkgs/xfsprogs/template b/srcpkgs/xfsprogs/template
index 7ed83db87b..076efa9428 100644
--- a/srcpkgs/xfsprogs/template
+++ b/srcpkgs/xfsprogs/template
@@ -1,7 +1,7 @@
 # Template file for 'xfsprogs'
 pkgname=xfsprogs
 version=3.1.11
-revision=1
+revision=2
 makedepends="libuuid-devel libblkid-devel readline-devel"
 replaces="xfsprogs-libs>=0"
 short_desc="Utilities for managing the XFS filesystem"
@@ -13,7 +13,7 @@ checksum=adf4980177b5c890c1ca86b9c0e3e4d69a3f95bfc01746844280c2393cf4d6be
 
 do_configure() {
 	export DEBUG=-DNDEBUG
-	configure_args+=" --enable-readline=yes --enable-blkid=yes --enable-lib64=no "
+	configure_args+=" --bindir=/usr/bin --sbindir=/usr/bin --enable-readline=yes --enable-blkid=yes --enable-lib64=no "
 	./configure ${configure_args}
 }
 
@@ -29,15 +29,16 @@ do_install() {
 	rm -f ${DESTDIR}/lib/*.{a,la}
 	rm -f ${DESTDIR}/usr/lib/*.{a,so}
 	# Move stuff to /usr.
-	mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/sbin
+	mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/bin
 	mv ${DESTDIR}/lib/* ${DESTDIR}/usr/lib
 }
 
 xfsprogs-devel_package() {
-	depends="libuuid-devel xfsprogs>=${version}"
+	depends="libuuid-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
+		vmove "usr/lib/*.so"
 		vmove usr/share/man/man3
 	}
 }