diff --git a/srcpkgs/glibc/glibc-devel.template b/srcpkgs/glibc/glibc-devel.template
index d2f7af3d8fe..ef2a3f28314 100644
--- a/srcpkgs/glibc/glibc-devel.template
+++ b/srcpkgs/glibc/glibc-devel.template
@@ -5,17 +5,14 @@ long_desc="${long_desc}
 
  This package contains files for development: headers, static libs, etc."
 
-revision=3
+revision=4
 
-Add_dependency run kernel-libc-headers
-Add_dependency run glibc
+Add_dependency run kernel-libc-headers ">=3.2.6<3.3"
+Add_dependency run glibc ">=${version}_5"
 
 do_install() {
 	vmove usr/include usr
 	vmove "usr/lib/*.a" usr/lib
 	vmove "usr/lib/*crt1.o" usr/lib
 	vmove usr/share/info usr/share
-
-	# Remove scsi.h, it's installed by kernel-libc-headers.
-	rm -f ${DESTDIR}/usr/include/scsi/scsi.h
 }
diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index a6f42110d3d..fef4cce51f5 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,7 +1,7 @@
 # Template file for 'glibc'
 pkgname=glibc
 version=2.14.1
-revision=4
+revision=5
 distfiles="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.bz2"
 short_desc="The GNU C library"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -26,7 +26,7 @@ Add_dependency run base-files
 Add_dependency run libgcc
 Add_dependency run glibc-locales
 Add_dependency build gcc
-Add_dependency build kernel-libc-headers
+Add_dependency build kernel-libc-headers ">=3.2.6<3.3"
 
 if [ -n "$BOOTSTRAP_PKG_REBUILD" ]; then
 	Add_dependency build coreutils
@@ -50,9 +50,10 @@ do_configure() {
 		echo "CFLAGS=$cflags" >> configparms
 	fi
 
-	SHELL=/bin/bash ../configure --prefix=/usr --with-tls \
-		--enable-add-ons --enable-multi-arch --with-__thread \
-		--enable-bind-now --enable-kernel=2.6.32 \
+	SHELL=/bin/bash ../configure ${CONFIGURE_SHARED_ARGS} --with-tls \
+		--enable-add-ons=nptl,libidn \
+		--enable-multi-arch --with-__thread \
+		--enable-bind-now --enable-kernel=2.6.27 \
 		--enable-stack-guard-randomization --disable-profile \
 		--without-cvs --without-gd --libexecdir=/usr/lib \
 		--libdir=/usr/lib --with-headers=${XBPS_MASTERDIR}/usr/include