diff --git a/templates/glibc32.tmpl b/templates/glibc32.tmpl
index c2e584dfbc1..47bc312f39e 100644
--- a/templates/glibc32.tmpl
+++ b/templates/glibc32.tmpl
@@ -75,10 +75,11 @@ post_install()
 	mv -v $destdir/usr/lib/* $destdir/usr/lib32/
 	rmdir $destdir/usr/lib
 
-	# Make some symlinks from /lib32 in /lib, to make gcc-multilib happy.
-	cd $destdir/lib && ln -s ../lib32/libc_nonshared.a .
 	cd $destdir/lib && ln -s ../lib32/ld-linux.so.2 .
-	cd $destdir/lib && ln -s ../lib32/libpthread_nonshared.a .
+
+	# Add /lib32 and /usr/lib32 into ld.so.conf.
+	echo "/lib32" >> $XBPS_MASTERDIR/etc/ld.so.conf
+	echo "/usr/lib32" >> $XBPS_MASTERDIR/etc/ld.so.conf
 
 	rm -rf $tmpdir
 	wrksrc=$XBPS_BUILDDIR/libc