diff --git a/srcpkgs/glibc/glibc-devel.template b/srcpkgs/glibc/glibc-devel.template
index d3447eb6474..d2f7af3d8fe 100644
--- a/srcpkgs/glibc/glibc-devel.template
+++ b/srcpkgs/glibc/glibc-devel.template
@@ -5,13 +5,12 @@ long_desc="${long_desc}
 
  This package contains files for development: headers, static libs, etc."
 
-revision=2
+revision=3
 
 Add_dependency run kernel-libc-headers
 Add_dependency run glibc
 
-do_install()
-{
+do_install() {
 	vmove usr/include usr
 	vmove "usr/lib/*.a" usr/lib
 	vmove "usr/lib/*crt1.o" usr/lib
diff --git a/srcpkgs/glibc/glibc-locales.template b/srcpkgs/glibc/glibc-locales.template
index 8ff85f2e861..df73b7e9e68 100644
--- a/srcpkgs/glibc/glibc-locales.template
+++ b/srcpkgs/glibc/glibc-locales.template
@@ -5,11 +5,11 @@ long_desc="${long_desc}
 
  This package contains the ${sourcepkg} locale files, for non US users."
 
+revision=1
 conf_files="/etc/default/libc-locales"
 noarch=yes
 
-do_install()
-{
+do_install() {
 	vmove etc/default etc
 	vmove usr/share/i18n usr/share
 	vmove usr/share/locale usr/share
diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 1c374974e52..a6f42110d3d 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,7 +1,7 @@
 # Template file for 'glibc'
 pkgname=glibc
 version=2.14.1
-revision=3
+revision=4
 distfiles="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.bz2"
 short_desc="The GNU C library"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -15,9 +15,10 @@ long_desc="
  as C++ and Objective C; the runtime facilities of other programming
  languages use the C library to access the underlying operating system."
 
-# Don't check for deps here
-ignore_vdeps_dir="/usr/lib/gconv"
 bootstrap=yes
+build_requires=19
+nostrip_files="ld-${version}.so libc-${version}.so libpthread-${version}.so
+libthread_db-1.0.so"
 conf_files="/etc/rpc /etc/ld.so.conf /etc/nsswitch.conf"
 subpackages="glibc-devel glibc-locales nscd"
 
@@ -32,11 +33,11 @@ if [ -n "$BOOTSTRAP_PKG_REBUILD" ]; then
 	Add_dependency build gettext
 	Add_dependency build gawk
 	Add_dependency build sed
+	Add_dependency build bison
 	Add_dependency build perl ">=0"
 fi
 
-do_build()
-{
+do_configure() {
 	local cflags
 
 	mkdir build && cd build
@@ -46,23 +47,22 @@ do_build()
 	# with Xen on x86 32bit.
 	if [ "${XBPS_MACHINE}" = "i686" ]; then
 		cflags="-mno-tls-direct-seg-refs -march=${XBPS_MACHINE%%-*}"
-		cflags="$cflags -mtune=generic"
+		echo "CFLAGS=$cflags" >> configparms
 	fi
-	cflags="$XBPS_CFLAGS $cflags"
-	echo "CFLAGS=$cflags" >> configparms
 
 	SHELL=/bin/bash ../configure --prefix=/usr --with-tls \
-		--enable-add-ons --enable-multi-arch \
-		--enable-bind-now --enable-kernel=2.6.39 \
+		--enable-add-ons --enable-multi-arch --with-__thread \
+		--enable-bind-now --enable-kernel=2.6.32 \
 		--enable-stack-guard-randomization --disable-profile \
 		--without-cvs --without-gd --libexecdir=/usr/lib \
 		--libdir=/usr/lib --with-headers=${XBPS_MASTERDIR}/usr/include
-
-	make ${makejobs}
 }
 
-do_install()
-{
+do_build() {
+	cd build && make ${makejobs}
+}
+
+do_install() {
 	# Create DESTDIR/etc/ld.so.conf
 	mkdir -p ${DESTDIR}/etc
 	echo "include /etc/ld.so.conf.d/*.conf" > ${DESTDIR}/etc/ld.so.conf