diff --git a/srcpkgs/gmp/depends b/srcpkgs/gmp/depends
index 580ada7b50..3067d907e6 100644
--- a/srcpkgs/gmp/depends
+++ b/srcpkgs/gmp/depends
@@ -1,2 +1,2 @@
-abi_depends=">=4.2.2"
+abi_depends=">=5.0.1"
 api_depends="${abi_depends}"
diff --git a/srcpkgs/gmp/template b/srcpkgs/gmp/template
index 4d5e2ae75a..ed11873f0f 100644
--- a/srcpkgs/gmp/template
+++ b/srcpkgs/gmp/template
@@ -1,14 +1,18 @@
 # Template build file for 'gmp'
 pkgname=gmp
-version=4.3.2
-distfiles="ftp://ftp.gmplib.org/pub/gmp-$version/gmp-$version.tar.bz2"
+version=5.0.1
+distfiles="ftp://ftp.gnu.org/gnu/gmp/gmp-${version}.tar.bz2"
 build_style=gnu_configure
 # Build with -fexceptions as suggested by ppl.
 CPPFLAGS="-fexceptions"
-configure_args="--enable-cxx --enable-mpbsd --build=${xbps_machine}-pc-linux-gnu"
+if [ "${xbps_machine}" = "i686" ]; then
+	configure_args="ABI=32"
+fi
+configure_args="${configure_args} --enable-cxx --enable-mpbsd
+--build=${xbps_machine}-unknown-linux-gnu"
 short_desc="Library for arbitrary precision arithmetic"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=936162c0312886c21581002b79932829aa048cfaf9937c6265aeaa14f1cd1775
+checksum=a2a610f01fd3298dc08c87bf30498c2402590e1bcb227fc40b15ee6d280939fb
 long_desc="
  GNU MP is a library for arbitrary precision arithmetic, operating on signed
  integers, rational numbers, and floating point numbers.  It has a rich set
@@ -27,6 +31,6 @@ long_desc="
 base_chroot=yes
 subpackages="gmp-devel"
 Add_dependency build m4
-Add_dependency run glibc
 Add_dependency run libgcc
+Add_dependency run glibc
 Add_dependency run libstdc++
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index 477d6c8497..fd66c1bac9 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -38,8 +38,8 @@ libbz2.so			bzip2			bzip2-devel
 libarchive.so			libarchive		libarchive-devel
 libgcc_s.so			libgcc
 libmp.so			gmp			gmp-devel
-libgmp.so			gmp			gmp-devel
-libgmpxx.so			gmp			gmp-devel
+libgmp.so.10			gmp			gmp-devel
+libgmpxx.so.10			gmp			gmp-devel
 libmpfr.so			mpfr			mpfr-devel
 libpwl.so			ppl			ppl-devel
 libppl.so			ppl			ppl-devel