diff --git a/srcpkgs/base-directories/INSTALL b/srcpkgs/base-directories/INSTALL
index f6a3f5b2471..964edc3431e 100644
--- a/srcpkgs/base-directories/INSTALL
+++ b/srcpkgs/base-directories/INSTALL
@@ -57,6 +57,10 @@ make_system_dirs()
 		install -d usr/lib32
 		ln -sf usr/lib32 lib32
 	fi
+	if [ "$(uname -m)" = "i686" ]; then
+		ln -sf lib lib32
+		ln -sf lib usr/lib32
+	fi
 
 	install -dm1777 tmp
 	install -dm1777 var/tmp
diff --git a/srcpkgs/base-directories/template b/srcpkgs/base-directories/template
index 16bf355910b..b56b7ec8320 100644
--- a/srcpkgs/base-directories/template
+++ b/srcpkgs/base-directories/template
@@ -1,11 +1,11 @@
 # Template file for 'base-directories'
 pkgname=base-directories
-version=0.24
+version=0.25
 revision=1
 noarch=yes
 bootstrap=yes
 build_style=meta
-short_desc="Void Linux base system directories"
+short_desc="Void Linux base system directories/symlinks"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.google.com/p/xbps"
 license="Public domain"