diff --git a/srcpkgs/chroot-gcc/template b/srcpkgs/chroot-gcc/template
index 1983dbd9afd..ecd39cdb0b4 100644
--- a/srcpkgs/chroot-gcc/template
+++ b/srcpkgs/chroot-gcc/template
@@ -7,7 +7,7 @@ _mpc_ver=0.8.2
 
 pkgname=chroot-gcc
 version=${_majorver}.3
-revision=7
+revision=8
 wrksrc="gcc-${version}"
 homepage="http://gcc.gnu.org"
 short_desc="The GNU C Compiler suite -- for xbps-src use"
@@ -63,9 +63,9 @@ _gmp_build() {
 	cp -f ${XBPS_CROSSPFDIR}/config.sub ../gmp-${_gmp_ver}/configfsf.sub
 
 	case "$XBPS_TARGET_MACHINE" in
-		i686*) export ABI=32;;
+		i686*) _abi="ABI=32";;
 	esac
-	../gmp-${_gmp_ver}/configure --prefix=${wrksrc}/buildtmp \
+	${_abi} ../gmp-${_gmp_ver}/configure --prefix=${wrksrc}/buildtmp \
 		--disable-shared --enable-static "$@"
 
 	make ${makejobs}
@@ -139,7 +139,7 @@ do_configure() {
 	cd gcc-build
 
 	CONFIG_SHELL=/bin/bash \
-		../gcc-${version}/configure --disable-bootstrap \
+		../gcc-${version}/configure \
 		--prefix=/usr --bindir=/usr/bin \
 		--mandir=/usr/share/man --infodir=/usr/share/info \
 		--libdir=/usr/lib --libexecdir=/usr/lib \