diff --git a/srcpkgs/xfsprogs/template b/srcpkgs/xfsprogs/template
index a5fe58f9a58..d6ada1230cc 100644
--- a/srcpkgs/xfsprogs/template
+++ b/srcpkgs/xfsprogs/template
@@ -27,7 +27,8 @@ Add_dependency build readline-devel
 
 do_build() {
 	export DEBUG=-DNDEBUG
-	./configure --enable-readline=yes --enable-blkid=yes --enable-lib64=no
+	./configure --libdir=/usr/lib --libexecdir=/usr/lib \
+		--enable-readline=yes --enable-blkid=yes --enable-lib64=no
 	make ${makejobs}
 }
 
@@ -36,4 +37,5 @@ do_install() {
 	# Remove unneeded stuff
 	rm -rf ${DESTDIR}/usr/share/doc
 	rm -f ${DESTDIR}/usr/share/man/man5/proj*
+	rm -f ${DESTDIR}/lib/*.{a,la}
 }
diff --git a/srcpkgs/xfsprogs/xfsprogs-devel.template b/srcpkgs/xfsprogs/xfsprogs-devel.template
index 171ede6861d..9f658f4bbc7 100644
--- a/srcpkgs/xfsprogs/xfsprogs-devel.template
+++ b/srcpkgs/xfsprogs/xfsprogs-devel.template
@@ -5,17 +5,13 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
+revision=1
+
 Add_dependency run libuuid-devel
 Add_dependency run xfsprogs-libs
 
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mkdir -p ${DESTDIR}/usr/share/man
-
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
+do_install() {
+	vmove usr/include usr
+	vmove "usr/lib/*.*a" usr/lib
+	vmove usr/share/man/man3 usr/share/man
 }
diff --git a/srcpkgs/xfsprogs/xfsprogs-libs.template b/srcpkgs/xfsprogs/xfsprogs-libs.template
index 1115e2b9584..14f24b6c6c6 100644
--- a/srcpkgs/xfsprogs/xfsprogs-libs.template
+++ b/srcpkgs/xfsprogs/xfsprogs-libs.template
@@ -5,10 +5,8 @@ long_desc="${long_desc}
 
  This package contains the shared libraries."
 
-do_install()
-{
-	mkdir -p ${DESTDIR}/lib
-	mv ${SRCPKGDESTDIR}/lib/*.so* ${DESTDIR}/lib
-	chmod 755 ${DESTDIR}/lib/*.so*
-	rm -f ${SRCPKGDESTDIR}/lib/*.*a
+revision=1
+
+do_install() {
+	vmove "lib/*.so*" usr/lib
 }