diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 6d6c9adec5e..5717b165f6e 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,7 +1,7 @@
 # Template file for 'glibc'
 pkgname=glibc
 version=2.18
-revision=5
+revision=6
 bootstrap=yes
 # Force creation of -dbg pkg, required by valgrind.
 force_debug_pkgs=yes
@@ -47,7 +47,8 @@ do_configure() {
 		i686) export CFLAGS+=" -mno-tls-direct-seg-refs";;
 		# Force hard float ABI.
 		# To build for soft float: --with-float=soft --without-fp.
-		arm*) configure_args+=" --with-float=hard";;
+		armv6l*) configure_args+=" --with-march=armv6 --with-fpu=vfp --with-float=hard";;
+		armv7l*) configure_args+=" --with-march=armv7-a --with-fpu=vfpv3 --with-float=hard";;
 	esac
 
 	if [ "$CROSS_BUILD" ]; then