diff --git a/srcpkgs/glibc32/template b/srcpkgs/glibc32/template
index 3edb2b9a80e..8e5b48d47c8 100644
--- a/srcpkgs/glibc32/template
+++ b/srcpkgs/glibc32/template
@@ -1,10 +1,10 @@
 # Template file for 'glibc32'
 pkgname=glibc32
-version=2.16.0
+version=2.17
 revision=6
 distfiles="
-http://xbps.nopcode.org/repos/current/glibc32-2.16.0_6.x86_64.xbps
-http://xbps.nopcode.org/repos/current/glibc32-devel-2.16.0_6.x86_64.xbps"
+ http://xbps.nopcode.org/repos/current/glibc-${version}_${revision}.i686.xbps
+ http://xbps.nopcode.org/repos/current/glibc-devel-${version}_${revision}.i686.xbps"
 depends="glibc>=$version"
 makedepends="bsdtar"
 short_desc="The GNU C library (32 bits)"
@@ -12,8 +12,8 @@ homepage="http://www.gnu.org/software/libc"
 license="GPL-2, LGPL-2.1, BSD"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum="
-a63a2d98b0f043d31713e538916e3c1a5cdf7b3bbab7d99054a4bb895cf43159
-72f6c2b475f77c38f46aaf6042f44c55e51fb1f3a1447cb7837590d69017ec42"
+ 066f601c0bbd8d5a68e4635d949b051406140f9be272f1c8d6761d7c6d67339d
+ cd6a93e5febebc32a1430863e66dc887fcd7751ccc7877b6e6123571fc7be4b7"
 long_desc="
  The GNU C Library is the standard system C library for all GNU systems,
  and is an important part of what makes up a GNU system.  It provides the
@@ -37,11 +37,11 @@ do_install() {
 
 	vinstall usr/include/gnu/stubs-32.h 644 usr/include/gnu
 	vmkdir usr/lib
-        vmkdir usr/lib32/gconv
-        cd ${wrksrc}
-
-	install -m644 usr/lib32/*.{a,o} ${DESTDIR}/usr/lib32
-	install -m755 usr/lib32/*.so ${DESTDIR}/usr/lib32
+	vmkdir usr/lib32/gconv
+	install -m644 usr/lib/*.{a,o} ${DESTDIR}/usr/lib32
+	install -m755 usr/lib/*.so ${DESTDIR}/usr/lib32
+	vcopy "usr/lib/gconv/*" usr/lib32/gconv
+	cd ${DESTDIR}/usr/lib && ln -sf ../lib32/ld-linux.so.2 .
 
 	# Add /lib32 and /usr/lib32 into ld.so(8) cache.
 	install -d ${DESTDIR}/etc/ld.so.conf.d