diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 24c66a7861..b289704f35 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -2,7 +2,7 @@
 pkgname=gcc
 _majorver=4.9
 version=${_majorver}.1
-revision=6
+revision=5
 short_desc="The GNU C Compiler"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://gcc.gnu.org"
@@ -33,8 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 	x86_64) _triplet="x86_64-unknown-linux-gnu";;
 	x86_64-musl) _triplet="x86_64-linux-musl";;
 	armv5tel) _triplet="arm-linux-gnueabi";;
-	armv6l) _triplet="arm-linux-gnueabihf";;
-	armv7l) _triplet="armv7l-linux-gnueabihf";;
+	armv[67]l) _triplet="arm-linux-gnueabihf";;
 	arm*-musl) _triplet="arm-linux-musleabi";;
 esac
 
@@ -62,6 +61,9 @@ do_configure() {
 		_langs="c,c++,lto"
 		_args+=" --disable-multilib --host=$XBPS_CROSS_TRIPLET --with-build-sysroot=${XBPS_CROSS_BASE}"
 	else
+		case "$XBPS_TARGET_MACHINE" in
+			arm*) _args+=" --build=${_triplet}";;
+		esac
 		_langs="c,c++,objc,obj-c++,fortran,lto,go,java"
 		_args+=" --enable-java-gc=boehm --enable-fast-character"
 	fi