diff --git a/common/shlibs b/common/shlibs
index cb6151cfd09..dc9207fdf39 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1734,3 +1734,4 @@ libjava.so openjdk-jre-8u20_1
 libjli.so openjdk-jre-8u20_1
 libjvm.so openjdk-jre-8u20_1
 libucl.so.0 libucl-0.5.2_1
+libhandle.so.1 xfsprogs-3.2.1_1
diff --git a/srcpkgs/xfsprogs/template b/srcpkgs/xfsprogs/template
index 7f273bb1401..c44c776214c 100644
--- a/srcpkgs/xfsprogs/template
+++ b/srcpkgs/xfsprogs/template
@@ -13,6 +13,7 @@ license="LGPL-2.1"
 homepage="http://oss.sgi.com/projects/xfs/"
 distfiles="ftp://oss.sgi.com/projects/xfs/cmd_tars/${pkgname}-${version}.tar.gz"
 checksum=83f8ea4c38fe9f42b9f12cd523519287a9695f2cf4f3064e9e9a839f71185767
+lib32disabled=yes
 
 pre_configure() {
 	export DEBUG=-DNDEBUG
@@ -22,11 +23,11 @@ do_install() {
 	make DIST_ROOT=${DESTDIR} install install-dev
 	# Remove unneeded stuff
 	rm -rf ${DESTDIR}/usr/share/doc
-	rm -f ${DESTDIR}/lib/*.{a,la}
+	rm -f ${DESTDIR}/lib*/*.{a,la}
 	rm -f ${DESTDIR}/usr/lib/*.{a,so}
 	# Move stuff to /usr.
 	mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/bin
-	mv ${DESTDIR}/lib/* ${DESTDIR}/usr/lib
+	mv ${DESTDIR}/lib*/* ${DESTDIR}/usr/lib
 }
 
 xfsprogs-devel_package() {