diff --git a/srcpkgs/glibc32/glibc32-devel.template b/srcpkgs/glibc32/glibc32-devel.template
index 1402bc520c0..9544d1ac1d9 100644
--- a/srcpkgs/glibc32/glibc32-devel.template
+++ b/srcpkgs/glibc32/glibc32-devel.template
@@ -1,15 +1,12 @@
 # Template file for 'glibc32-devel'.
 #
-depends="glibc-devel glibc32"
+depends="glibc-devel>=$version glibc32>=$version"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development: headers, static libs, etc."
 
-
-
-do_install()
-{
+do_install() {
 	vmove usr/include usr
 	for f in a o; do
 		vmove "usr/lib32/*.${f}" usr/lib32
diff --git a/srcpkgs/glibc32/template b/srcpkgs/glibc32/template
index dd119d2be39..0cd70a36032 100644
--- a/srcpkgs/glibc32/template
+++ b/srcpkgs/glibc32/template
@@ -1,17 +1,17 @@
 # Template file for 'glibc32'
 pkgname=glibc32
-version=2.14.1
-revision=8
+version=2.16.0
+revision=5
 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"
-depends="glibc"
+depends="glibc>=$version"
 makedepends="bsdtar"
 short_desc="The GNU C library (32 bits)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum="
-b02efe395f09a93e29c4623aeffedc881e5bd68ec0df3dce55dab6800365948c
-068697a14ce6ccc68213180654fe98eeeb4624fca0b79a78e75e13f97dd92e21"
+5db9e003deb8468ea6a38e8b87202ba9fc5e5077bad3825b4b9c64b6f03b418e
+893b25374bdf5d8198afa79b5b7d980e7fd82e4e54f3c33e2057c15a30619c41"
 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
@@ -27,7 +27,6 @@ noextract=yes
 noverifyrdeps=yes
 only_for_archs=x86_64
 
-
 do_install() {
 	for f in ${distfiles}; do
 		local srcfile="${XBPS_SRCDISTDIR}/$(basename ${f})"
@@ -35,24 +34,21 @@ do_install() {
 	done
 
 	vinstall usr/include/gnu/stubs-32.h 644 usr/include/gnu
-	vinstall usr/include/sys/elf.h 644 usr/include/sys
-	vinstall usr/include/sys/vm86.h 644 usr/include/sys
 
-	vmkdir lib
-	vmkdir lib32
+	vmkdir usr/lib
 	vmkdir usr/lib32/gconv
-	vcopy "lib/*.so*" lib32
+	vcopy "lib/*.so*" usr/lib32
 	vcopy "usr/lib/gconv/*" usr/lib32/gconv
 
-	ln -sf /lib32/ld-linux.so.2 ${DESTDIR}/lib/ld-linux.so.2
+	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
 
 	# Add /lib32 and /usr/lib32 into ld.so(8) cache.
 	install -d ${DESTDIR}/etc/ld.so.conf.d
-	{ echo "/lib32"; echo "/usr/lib32"; } \
-		> ${DESTDIR}/etc/ld.so.conf.d/glibc32.conf
+	echo "/usr/lib32" > ${DESTDIR}/etc/ld.so.conf.d/glibc32.conf
 
 	chmod 644 ${DESTDIR}/etc/ld.so.conf.d/glibc32.conf && ldconfig