diff --git a/srcpkgs/chroot-gcc/template b/srcpkgs/chroot-gcc/template
index 41a44c1a897..1eed20ae832 100644
--- a/srcpkgs/chroot-gcc/template
+++ b/srcpkgs/chroot-gcc/template
@@ -2,12 +2,12 @@
 #
 _majorver=4.7
 _gmp_ver=5.0.5
-_mpfr_ver=3.1.1
+_mpfr_ver=3.1.2
 _mpc_ver=0.8.2
 
 pkgname=chroot-gcc
-version=${_majorver}.2
-revision=2
+version=${_majorver}.3
+revision=1
 wrksrc="gcc-${version}"
 homepage="http://gcc.gnu.org"
 short_desc="The GNU C Compiler suite -- for xbps-src use"
@@ -19,9 +19,9 @@ distfiles="
  http://www.mpfr.org/mpfr-current/mpfr-${_mpfr_ver}.tar.bz2
  http://www.multiprecision.org/mpc/download/mpc-${_mpc_ver}.tar.gz"
 checksum="
- 8a9283d7010fb9fe5ece3ca507e0af5c19412626384f8a5e9434251ae100b084
+ 2f7c37eb4fc14422ff2358a9ef59c974a75ab41204ef0e49fc34ab1d8981a9c3
  1f588aaccc41bb9aed946f9fe38521c26d8b290d003c5df807f65690f2aadec9
- 7b66c3f13dc8385f08264c805853f3e1a8eedab8071d582f3e661971c9acd5fd
+ 79c73f60af010a30a5c27a955a1d2d01ba095b72537dab0ecaad57f5a7bb1b6b
  ae79f8d41d8a86456b68607e9ca398d00f8b7342d1d83bcf4428178ac45380c7"
 
 create_wrksrc=yes
@@ -104,11 +104,11 @@ _mpc_build() {
 do_configure() {
 	local _floatabi _args
 
-	if [ "${XBPS_MACHINE}" = "armv6l" ]; then
+	if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
 		_floatabi="--with-float=hard"
 	fi
 
-	if [ -n "$XBPS_CROSS_TRIPLET" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		export CC="$XBPS_CROSS_TRIPLET-gcc"
 		export GCC="$CC"
 		export CC_FOR_TARGET="$CC"
@@ -152,17 +152,17 @@ do_build() {
 do_install() {
 	local _triplet=
 
-	if [ "${XBPS_MACHINE}" = "x86_64" ]; then
-		_triplet="${XBPS_MACHINE}-unknown-linux-gnu"
-	elif [ "${XBPS_MACHINE}" = "i686" ]; then
-		_triplet="${XBPS_MACHINE}-pc-linux-gnu"
-	elif [ "${XBPS_MACHINE}" = "armv6l" ]; then
+	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+		_triplet="${XBPS_TARGET_MACHINE}-unknown-linux-gnu"
+	elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+		_triplet="${XBPS_TARGET_MACHINE}-pc-linux-gnu"
+	elif [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
 		_triplet="arm-linux-gnueabihf"
 	else
 		msg_error "$pkgver: unknown XBPS_MACHINE\n"
 	fi
 
-	if [ "$XBPS_MACHINE" = "x86_64" ]; then
+	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 		vmkdir usr/lib
 		cd ${DESTDIR}/usr && ln -sf lib lib64 && cd ${wrksrc}
 	fi