diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index c4a7c0694d0..5b0c8b98fcd 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,7 +1,7 @@
 # Template file for 'glibc'
 pkgname=glibc
 version=2.21
-revision=4
+revision=5
 bootstrap=yes
 short_desc="The GNU C library"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
@@ -20,13 +20,33 @@ nostrip_files="
 	POSIX_V6_LP64_OFF64
 	POSIX_V7_LP64_OFF64
 	XBS5_LP64_OFF64"
+# Do not strip shlibs required by valgrind.
+nostrip_files="
+	ld-${version}.so
+	libdl-{version}.so
+	libanl-${version}.so
+	libcidn-${version}.so
+	libresolv-${version}.so
+	libcrypt-${version}.soa
+	libpthread-${version}.so
+	libm-${version}.so
+	libutil-${version}.so
+	libthread_db-1.0.so
+	librt-${version}.so
+	libnsl-${version}.so
+	libc-${version}.so
+	libBrokenLocale-${version}.so
+	libnss_compat-${version}.so
+	libnss_db-${version}.so
+	libnss_dns-${version}.so
+	libnss_files-${version}.so
+	libnss_hesiod-${version}.so
+	libnss_nis-${version}.so"
+
 conf_files="
 	/etc/rpc
 	/etc/gai.conf
 	/etc/ld.so.conf"
-# Force creation of -dbg pkg, required by valgrind.
-force_debug_pkgs=yes
-
 if [ "$CHROOT_READY" ]; then
 	hostmakedepends="bison perl"
 fi