diff --git a/srcpkgs/glibc/glibc-devel.template b/srcpkgs/glibc/glibc-devel.template
index ef2a3f28314..5874c7dbbc9 100644
--- a/srcpkgs/glibc/glibc-devel.template
+++ b/srcpkgs/glibc/glibc-devel.template
@@ -5,7 +5,7 @@ long_desc="${long_desc}
 
  This package contains files for development: headers, static libs, etc."
 
-revision=4
+revision=5
 
 Add_dependency run kernel-libc-headers ">=3.2.6<3.3"
 Add_dependency run glibc ">=${version}_5"
diff --git a/srcpkgs/glibc/glibc-locales.template b/srcpkgs/glibc/glibc-locales.template
index df73b7e9e68..7ffcf1a9193 100644
--- a/srcpkgs/glibc/glibc-locales.template
+++ b/srcpkgs/glibc/glibc-locales.template
@@ -5,7 +5,7 @@ long_desc="${long_desc}
 
  This package contains the ${sourcepkg} locale files, for non US users."
 
-revision=1
+revision=2
 conf_files="/etc/default/libc-locales"
 noarch=yes
 
diff --git a/srcpkgs/glibc/nscd.template b/srcpkgs/glibc/nscd.template
index 646378239cb..4b4036d53c8 100644
--- a/srcpkgs/glibc/nscd.template
+++ b/srcpkgs/glibc/nscd.template
@@ -5,7 +5,7 @@ long_desc="
  This package contains nscd, a daemon that provides a cache for the
  most common name service requests."
 
-revision=3
+revision=4
 systemd_services="nscd.service on"
 conf_files="/etc/nscd.conf"
 
diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index fef4cce51f5..2521c8d640b 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,7 +1,7 @@
 # Template file for 'glibc'
 pkgname=glibc
 version=2.14.1
-revision=5
+revision=6
 distfiles="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.bz2"
 short_desc="The GNU C library"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -46,7 +46,7 @@ do_configure() {
 	# Build with -mno-tls-direct-seg-refs to avoid performance problems
 	# with Xen on x86 32bit.
 	if [ "${XBPS_MACHINE}" = "i686" ]; then
-		cflags="-mno-tls-direct-seg-refs -march=${XBPS_MACHINE%%-*}"
+		cflags="-mno-tls-direct-seg-refs -O2 -march=${XBPS_MACHINE%%-*}"
 		echo "CFLAGS=$cflags" >> configparms
 	fi