diff --git a/srcpkgs/glibc/files/libc-locales b/srcpkgs/glibc/files/libc-locales
index 934f2d3b088..ea96a2034e4 100644
--- a/srcpkgs/glibc/files/libc-locales
+++ b/srcpkgs/glibc/files/libc-locales
@@ -5,23 +5,3 @@
 # If you add new locales you can regenerate them with:
 #	``xbps-bin -f reconfigure glibc-locales´´
 #
-# By default we enable de, fr, it, en (US and GB) and es locales
-# for ISO-8859-1[5] and UTF-8.
-#
-en_US		ISO-8859-1
-en_US.UTF-8	UTF-8
-en_GB		ISO-8859-1
-en_GB.UTF-8	UTF-8
-de_DE		ISO-8859-1
-de_DE@euro	ISO-8859-15
-de_DE.UTF-8	UTF-8
-it_IT		ISO-8859-1
-it_IT@euro	ISO-8859-15
-it_IT.UTF-8	UTF-8
-fr_FR		ISO-8859-1
-fr_FR@euro	ISO-8859-15
-fr_FR.UTF-8	UTF-8
-es_ES		ISO-8859-1
-es_ES@euro	ISO-8859-15
-es_ES.UTF-8	UTF-8
-
diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index d150b5dd440..218665aa2bb 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,7 +1,7 @@
 # Template file for 'glibc'
 pkgname=glibc
 version=2.17
-revision=6
+revision=7
 short_desc="The GNU C library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/libc"
@@ -11,6 +11,9 @@ checksum=6914e337401e0e0ade23694e1b2c52a5f09e4eda3270c67e7c3ba93a89b5b23e
 
 hostmakedepends="bison perl kernel-libc-headers>=3.7<3.8"
 
+# Force creation of -dbg pkg, required by valgrind.
+force_debug_pkgs=yes
+
 do_configure() {
 	local _headers _floatabi
 
@@ -94,7 +97,7 @@ do_install() {
 
 glibc-devel_package() {
 	depends="kernel-libc-headers glibc>=${version}"
-	short_desc="${short_desc} -- development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"
@@ -106,7 +109,7 @@ glibc-devel_package() {
 glibc-locales_package() {
 	noarch=yes
 	conf_files="/etc/default/libc-locales"
-	short_desc="${short_desc} -- locales"
+	short_desc+=" - locale data files"
 	pkg_install() {
 		vmove etc/default
 		vmove usr/share/i18n
@@ -117,7 +120,7 @@ glibc-locales_package() {
 nscd_package() {
 	systemd_services="nscd.service on"
 	conf_files="/etc/nscd.conf"
-	short_desc="${short_desc} -- Name Service Cache Daemon"
+	short_desc+=" - Name Service Cache Daemon"
 	pkg_install() {
 		vmove usr/sbin/nscd
 		vinstall ${FILESDIR}/nscd.service 644 usr/lib/systemd/system
@@ -144,17 +147,6 @@ glibc_package() {
 		/etc/ld.so.conf"
 	depends="base-files glibc-locales"
 	pkg_install() {
-		vmove usr/bin
-		vmove usr/sbin/zic
-		vmove usr/sbin/ldconfig
-		vmove usr/sbin/iconvconfig
-		vmove usr/sbin/zdump
-		vmove usr/sbin/sln
-		vmove "usr/lib/*.so*"
-		vmove "usr/lib/*.o"
-		vmove usr/lib/gconv
-		vmove usr/lib/pt_chown
-		vmove "etc/ld.so.conf*"
-		vmove etc/rpc
+		vmove all
 	}
 }