diff --git a/gmp/build.sh b/gmp/build.sh
index e3aed39..e2ade40 100755
--- a/gmp/build.sh
+++ b/gmp/build.sh
@@ -6,23 +6,23 @@
 ###########################################################
 # Check the following 4 variables before running the script
 topdir=gmp
-version=5.0.1
+version=5.1.2
 pkgver=1
 source[0]=ftp://ftp.sunet.se/pub/gnu/gmp/$topdir-$version.tar.bz2
 # If there are no patches, simply comment this
-#patch[0]=
+patch[0]=gmp-5.1.2-no-c99-trunc.patch
 
 # Source function library
 . ${BUILDPKG_SCRIPTS}/buildpkg.functions
 
-# Global settings
-export LDFLAGS="-L$prefix/lib -R$prefix/lib"
-[ "$_os" = "sunos56" ] && triplet="${arch}-sun-solaris2.6"
-[ "$_os" = "sunos57" ] && triplet="${arch}-sun-solaris2.7"
-configure_args=(--host=$triplet --build=$triplet "${configure_args[@]}" --enable-cxx)
-# otherwise configure tests will fail since they don't respect LDFLAGS :(
-export LD_LIBRARY_PATH="$prefix/lib"
+# Get host triplet
+. ${BUILDPKG_BASE}/gcc/build.sh.gcc.cpu
 
+# Global settings
+export CPPFLAGS="-I$prefix/include"
+export LDFLAGS="-L$prefix/lib -R$prefix/lib"
+export LD_OPTIONS="-R$prefix/lib"
+configure_args=(--host=$gmp_host --build=$gmp_host "${configure_args[@]}" --enable-cxx)
 
 reg prep
 prep()
@@ -48,10 +48,12 @@ install()
     generic_install DESTDIR
     doc AUTHORS COPYING COPYING.LIB NEWS README
 
-    # Compat libraries
+    # Compat library for stuff built against gmp 4.2
     setdir ${prefix}/${_libdir}
     ${__tar} -cf - libgmp.so.3* | (cd ${stagedir}${prefix}/${_libdir}; ${__tar} -xf -)
     compat gmp 4.2.4 1 5
+    #
+    compat gmp 5.0.1 1 1
 }
 
 reg pack
diff --git a/gmp/meta/ChangeLog b/gmp/meta/ChangeLog
index f6b7576..b976502 100644
--- a/gmp/meta/ChangeLog
+++ b/gmp/meta/ChangeLog
@@ -1,4 +1,7 @@
 CHANGELOG
 ---------
+* Sat Oct 05 2013 Tom G. Christensen <swpkg@jupiterrise.com> - 5.1.2-1
+- Update to 5.1.2
+
 * Thu Apr 22 2010 Tom G. Christensen <swpkg@jupiterrise.com> - 5.0.1-1
 - Update to 5.0.1
diff --git a/gmp/meta/relnotes b/gmp/meta/relnotes
deleted file mode 100644
index bd83629..0000000
--- a/gmp/meta/relnotes
+++ /dev/null
@@ -1,27 +0,0 @@
-PACKAGE DETAILS
----------------
-Name:	    %%PKGNAME%%
-Version:    %%SOURCE_AND_VER%%
-Vendor:	    %%VENDOR%%
-Packager:   %%PKGEDBY%%
-
-Source (sha1sum):
-%%SOURCE_SHA1SUM%%
-
-BUILD DETAILS
--------------
-Compiler:
-%%COMPILER%%
-
-Environment:
-%%ENVIRONMENT%%
-
-Configure:
-%%CONFIGURE%%
-
-KNOWN DEPENDENCIES
-------------------
-%%DEPENDENCIES%%
-
-ERRORS/MISCELLANEOUS
---------------------
diff --git a/gmp/src/gmp-5.1.2-no-c99-trunc.patch b/gmp/src/gmp-5.1.2-no-c99-trunc.patch
new file mode 100644
index 0000000..5673dfc
--- /dev/null
+++ b/gmp/src/gmp-5.1.2-no-c99-trunc.patch
@@ -0,0 +1,17 @@
+diff -up gmp-5.1.2/tests/cxx/t-ops2.cc.orig gmp-5.1.2/tests/cxx/t-ops2.cc
+--- gmp-5.1.2/tests/cxx/t-ops2.cc.orig	2013-05-20 16:59:58.000000000 +0200
++++ gmp-5.1.2/tests/cxx/t-ops2.cc	2013-06-26 22:05:24.510417000 +0200
+@@ -26,6 +26,13 @@ the GNU MP Library test suite.  If not,
+ #include "gmp-impl.h"
+ #include "tests.h"
+ 
++#ifndef trunc
++double trunc(double x)
++{
++  return x < 0 ? ceil(x) : floor(x);
++}
++#endif
++
+ 
+ #define CHECK1(Type,a,fun) \
+   ASSERT_ALWAYS(fun((Type)(a))==fun(a))