diff --git a/templates/gmp/devel.template b/templates/gmp/devel.template
index e8ede6993f3..fd33f51e1e7 100644
--- a/templates/gmp/devel.template
+++ b/templates/gmp/devel.template
@@ -5,6 +5,7 @@ long_desc="${long_desc}
 
  This package contains files for development: headers, static libs, etc."
 
+revision=1
 Add_dependency run gmp
 
 do_install()
diff --git a/templates/gmp/template b/templates/gmp/template
index 4b56a06eae5..d8a89b8c61a 100644
--- a/templates/gmp/template
+++ b/templates/gmp/template
@@ -1,9 +1,13 @@
 # Template build file for 'gmp'
 pkgname=gmp
 version=4.3.1
+revision=1
 distfiles="ftp://ftp.gmplib.org/pub/gmp-$version/gmp-$version.tar.bz2"
 build_style=gnu_configure
-configure_args="--enable-cxx --enable-mpbsd"
+if [ "$xbps_machine" != "x86_64" ]; then
+	configure_args="--build=${xbps_machine}-pc-linux-gnu"
+fi
+configure_args="$configure_args --enable-cxx --enable-mpbsd"
 short_desc="Library for arbitrary precision arithmetic"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=aa0295472854f2f9691db7c6892921452521b4d5def15223136f4733309db7c8
@@ -24,14 +28,5 @@ long_desc="
 
 base_chroot=yes
 subpackages="devel"
-
 Add_dependency build m4
 Add_dependency run glibc
-
-pre_configure()
-{
-	if [ "$xbps_machine" != "x86_64" ]; then
-		local triplet="$xbps_machine-pc-linux-gnu"
-		configure_args="--host=$triplet --build=$triplet"
-	fi
-}