diff --git a/common/hooks/post-install/00-lib32.sh b/common/hooks/post-install/00-lib32.sh
index a1c66e65f68..f5c4fa259ec 100644
--- a/common/hooks/post-install/00-lib32.sh
+++ b/common/hooks/post-install/00-lib32.sh
@@ -1,7 +1,8 @@
-# This hook removes the /usr/lib32 symlink on x86.
+# This hook removes the /usr/lib32 symlink on 32-bit systems.
 
 hook() {
-	if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+	if [ "$XBPS_TARGET_WORDSIZE" = "32" ] && \
+	   [ "${pkgname}" != "base-files" ]; then
 		rm -f ${PKGDESTDIR}/usr/lib32
 	fi
 }
diff --git a/common/hooks/pre-install/00-lib32.sh b/common/hooks/pre-install/00-lib32.sh
index 199856bab1a..0d97a825758 100644
--- a/common/hooks/pre-install/00-lib32.sh
+++ b/common/hooks/pre-install/00-lib32.sh
@@ -1,7 +1,8 @@
-# This hook creates the /usr/lib32 symlink for x86.
+# This hook creates the /usr/lib32 symlink for 32-bit systems.
 
 hook() {
-	if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+	if [ "$XBPS_TARGET_WORDSIZE" = "32" ] && \
+	   [ "${pkgname}" != "base-files" ]; then
 		vmkdir usr/lib
 		ln -sf lib ${PKGDESTDIR}/usr/lib32
 	fi
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 68ea75347a7..af5a56322e9 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,7 +1,7 @@
 # Template file for 'base-files'
 pkgname=base-files
 version=0.140
-revision=9
+revision=10
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"