diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 1bc3fe86a56..31d1e813ef8 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,6 +1,6 @@
 # Template file for 'base-files'
 pkgname=base-files
-version=0.93
+version=0.94
 revision=1
 bootstrap=yes
 build_style="meta"
@@ -25,11 +25,14 @@ conf_files="
 	/etc/fstab
 	/etc/crypttab
 	/etc/nsswitch.conf"
-noarch="yes"
 depends="base-directories xbps-triggers"
 
 do_install() {
-	vinstall ${FILESDIR}/ld.so.lib32.conf 644 etc/ld.so.conf.d lib32.conf
+	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+		vmkdir usr/lib
+		ln -s ../lib32/ld-linux.so.2 ${DESTDIR}/usr/lib/ld-linux.so.2
+		vinstall ${FILESDIR}/ld.so.lib32.conf 644 etc/ld.so.conf.d lib32.conf
+	fi
 
 	# Install misc config files.
 	for f in bash_logout bash_profile bashrc inputrc; do