diff --git a/srcpkgs/base-directories/INSTALL b/srcpkgs/base-directories/INSTALL
index eea51531ee6..5f15238cecd 100644
--- a/srcpkgs/base-directories/INSTALL
+++ b/srcpkgs/base-directories/INSTALL
@@ -52,8 +52,10 @@ make_system_dirs()
 	cd var && ln -sf ../run/lock . && cd ..
 
 	if [ "$(uname -m)" = "x86_64" ]; then
-		ln -sf usr/lib lib64
-		cd usr && ln -sf lib lib64 && cd ..
+		ln -sfr usr/lib lib64
+		ln -sfr lib lib64
+		install -d usr/lib32
+		ln -sfr usr/lib32 lib32
 	fi
 
 	install -dm1777 tmp
diff --git a/srcpkgs/base-directories/template b/srcpkgs/base-directories/template
index e62ed219de3..fc1dfaf5b4c 100644
--- a/srcpkgs/base-directories/template
+++ b/srcpkgs/base-directories/template
@@ -1,6 +1,6 @@
 # Template file for 'base-directories'
 pkgname=base-directories
-version=0.19
+version=0.20
 revision=1
 noarch=yes
 bootstrap=yes