diff --git a/srcpkgs/glibc32/template b/srcpkgs/glibc32/template
index 0cd70a36032..d97bda44ced 100644
--- a/srcpkgs/glibc32/template
+++ b/srcpkgs/glibc32/template
@@ -1,17 +1,19 @@
 # Template file for 'glibc32'
 pkgname=glibc32
 version=2.16.0
-revision=5
+revision=6
 distfiles="
-http://xbps.hosting-unlimited.org/binpkgs/i686/glibc-${version}_${revision}.i686.xbps
-http://xbps.hosting-unlimited.org/binpkgs/i686/glibc-devel-${version}_${revision}.i686.xbps"
+http://xbps.nopcode.org/repos/current/glibc32-2.16.0_5.x86_64.xbps
+http://xbps.nopcode.org/repos/current/glibc32-devel-2.16.0_5.x86_64.xbps"
 depends="glibc>=$version"
 makedepends="bsdtar"
 short_desc="The GNU C library (32 bits)"
+homepage="http://www.gnu.org/software/libc"
+license="GPL-2, LGPL-2.1, BSD"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum="
-5db9e003deb8468ea6a38e8b87202ba9fc5e5077bad3825b4b9c64b6f03b418e
-893b25374bdf5d8198afa79b5b7d980e7fd82e4e54f3c33e2057c15a30619c41"
+9cdc1ab5a0e83b5b71192f48d8aa1b398923bd3858e57902408c30cc54510ac0
+312d815df94e058051954e85ff3ff3c2fa57d4e5b559bf93cfb1dcb28de37cc4"
 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
@@ -34,17 +36,12 @@ do_install() {
 	done
 
 	vinstall usr/include/gnu/stubs-32.h 644 usr/include/gnu
-
 	vmkdir usr/lib
-	vmkdir usr/lib32/gconv
-	vcopy "lib/*.so*" usr/lib32
-	vcopy "usr/lib/gconv/*" usr/lib32/gconv
+        vmkdir usr/lib32/gconv
+        cd ${wrksrc}
 
-	cd ${DESTDIR}/usr/lib && ln -sf ../lib32/ld-linux.so.2 .
-	cd ${wrksrc}
-
-	install -m644 usr/lib/*.{a,o} ${DESTDIR}/usr/lib32
-	install -m755 usr/lib/*.so ${DESTDIR}/usr/lib32
+	install -m644 usr/lib32/*.{a,o} ${DESTDIR}/usr/lib32
+	install -m755 usr/lib32/*.so ${DESTDIR}/usr/lib32
 
 	# Add /lib32 and /usr/lib32 into ld.so(8) cache.
 	install -d ${DESTDIR}/etc/ld.so.conf.d