diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 1936134c395..c26e01dbfcd 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,7 +1,7 @@
 # Template file for 'glibc'
 pkgname=glibc
 version=2.19
-revision=2
+revision=3
 bootstrap=yes
 # Force creation of -dbg pkg, required by valgrind.
 force_debug_pkgs=yes
@@ -36,7 +36,13 @@ do_configure() {
 	mkdir build
 	cd build
 
-	echo "slibdir=/usr/lib" > configparms
+	if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+		_libdir=/usr/lib32
+	else
+		_libdir=/usr/lib
+	fi
+
+	echo "slibdir=${_libdir}" > configparms
 	echo "bindir=/usr/bin" >> configparms
 	echo "sbindir=/usr/sbin" >> configparms
 	echo "rootsbindir=/usr/sbin" >> configparms
@@ -59,7 +65,7 @@ do_configure() {
 
 	SHELL=/bin/bash ../configure ${configure_args} \
 		--bindir=/usr/bin --sbindir=/usr/sbin \
-		--libdir=/usr/lib --libexecdir=/usr/lib \
+		--libdir=${_libdir} --libexecdir=${_libdir} \
 		--enable-add-ons=ports,nptl,libidn --enable-obsolete-rpc \
 		--enable-multi-arch --enable-bind-now \
 		--disable-profile --enable-kernel=2.6.27 \
@@ -73,6 +79,9 @@ do_build() {
 }
 
 do_install() {
+	vmkdir usr/lib
+	ln -s lib ${DESTDIR}/usr/lib32
+
 	# Create DESTDIR/etc/ld.so.conf
 	mkdir -p ${DESTDIR}/etc
 	echo "include /etc/ld.so.conf.d/*.conf" > ${DESTDIR}/etc/ld.so.conf
@@ -110,10 +119,13 @@ do_install() {
 
 	vinstall ${wrksrc}/posix/gai.conf 644 etc
 
+	rm -rf ${DESTDIR}/usr/lib32
 	rm -rf ${DESTDIR}/var/db
 }
 
 glibc-devel_package() {
+	lib32depends="glibc>=${version}_${revision}"
+	lib32files="/usr/include/gnu/stubs-32.h"
 	depends="kernel-libc-headers glibc>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {