diff --git a/srcpkgs/chroot-glibc/template b/srcpkgs/chroot-glibc/template
index 9b90a502a04..5cb5534d511 100644
--- a/srcpkgs/chroot-glibc/template
+++ b/srcpkgs/chroot-glibc/template
@@ -3,7 +3,7 @@ pkgname=chroot-glibc
 _majorver=2.17
 version=${_majorver}
 wrksrc="glibc-${version}"
-revision=4
+revision=5
 short_desc="The GNU C library -- for xbps-src use"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/libc"
@@ -28,8 +28,8 @@ nostrip_files="
  POSIX_V7_LP64_OFF64
  XBS5_LP64_OFF64"
 
-if [ -n "$IN_CHROOT" ]; then
-	makedepends="bison perl"
+if [ "$IN_CHROOT" ]; then
+	hostmakedepends="bison perl"
 fi
 
 do_configure() {
@@ -42,14 +42,14 @@ do_configure() {
 
 	# Build with -mno-tls-direct-seg-refs to avoid performance problems
 	# with Xen on x86 32bit.
-	if [ "${XBPS_MACHINE}" = "i686" ]; then
+	if [ "${XBPS_TARGET_MACHINE}" = "i686" ]; then
 		export CFLAGS="$CFLAGS -mno-tls-direct-seg-refs"
-        elif [ "$XBPS_MACHINE" = "armv6l" ]; then
+        elif [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
 		# Force hard float ABI.
 		# To build for soft float: --with-float=soft --without-fp.
 		_floatabi="--with-float=hard"
 	fi
-	if [ -n "$XBPS_CROSS_TRIPLET" ]; then
+	if [ "$XBPS_CROSS_BUILD" ]; then
 		_headers="--with-headers=/usr/$XBPS_CROSS_TRIPLET/include"
 	else
 		_headers="--with-headers=/usr/include"
@@ -61,7 +61,8 @@ do_configure() {
 		--enable-bind-now --enable-kernel=2.6.27 \
 		--enable-stack-guard-randomization --disable-profile \
 		--without-cvs --without-gd --libexecdir=/usr/lib \
-		--libdir=/usr/lib ${_floatabi} ${_headers}
+		--libdir=/usr/lib --disable-build-nscd --disable-nscd \
+		${_floatabi} ${_headers}
 }
 
 do_build() {
@@ -81,7 +82,7 @@ do_install() {
 	replace_interpreter bash ${DESTDIR}/usr/bin/ldd
 
 	# On x86_64, add dynamic linker's 32bit version to ldd.
-	if [ "$XBPS_MACHINE" = "x86_64" ]; then
+	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 		rtldlist="/lib/ld-linux.so.2 /lib/ld-linux-x86-64.so.2"
 		sed -i "s|^RTLDLIST.*$|RTLDLIST=\"$rtldlist\"|" \
 			${DESTDIR}/usr/bin/ldd
@@ -99,8 +100,11 @@ do_install() {
 	vmove "sbin/*" usr/sbin
 
 	# Create ld-linux.so.3 symlink for ARM.
-	if [ "$XBPS_MACHINE" = "armv6l" ]; then
+	if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
 		ln -sfr ${DESTDIR}/usr/lib/ld-linux-armhf.so.3 \
 			${DESTDIR}/usr/lib/ld-linux.so.3
 	fi
+
+	# Remove unused stuff.
+	rm -rf ${DESTDIR}/var
 }