diff --git a/devel/gmp/Makefile b/devel/gmp/Makefile
index 27e13962e91..4c91c8b6e47 100644
--- a/devel/gmp/Makefile
+++ b/devel/gmp/Makefile
@@ -1,27 +1,29 @@
-# $OpenBSD: Makefile,v 1.19 2008/10/26 23:05:41 naddy Exp $
+# $OpenBSD: Makefile,v 1.20 2009/06/06 17:45:48 naddy Exp $
 
 COMMENT=	library for arbitrary precision arithmetic
 
-DISTNAME=	gmp-4.2.4
-SHARED_LIBS +=	gmp                  7.1      # .7.4
+DISTNAME=	gmp-4.3.1
+SHARED_LIBS +=  gmp                  8.0      # .8.0
+SHARED_LIBS +=  gmpxx                0.0      # .5.0
 CATEGORIES=	devel math
 
 HOMEPAGE=	http://gmplib.org/
 
 MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
 
-# LGPLv3
+# LGPLv3+
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	ftp://ftp.gmplib.org/pub/ \
+MASTER_SITES=	ftp://ftp.gmplib.org/pub/${DISTNAME}/ \
 		${MASTER_SITE_GNU:=gmp/}
 
 USE_LIBTOOL=	Yes
 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	${CONFIGURE_SHARED}
+CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
+		--enable-cxx
 # Don't try to optimize for the local CPU submodel
 CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-unknown-openbsd${OSrev}
 
diff --git a/devel/gmp/distinfo b/devel/gmp/distinfo
index bef5e4a4f6b..208c8f471e1 100644
--- a/devel/gmp/distinfo
+++ b/devel/gmp/distinfo
@@ -1,5 +1,5 @@
-MD5 (gmp-4.2.4.tar.gz) = Qw+Wa/j+KNRa2GcKUrQOjA==
-RMD160 (gmp-4.2.4.tar.gz) = gXphdyduielYOWKZV5n7D+fNBpE=
-SHA1 (gmp-4.2.4.tar.gz) = qSt6Z1QwEO2RfAVMAd5ncyuNkak=
-SHA256 (gmp-4.2.4.tar.gz) = CWUrUeNI6kWfEhwBtLcYmCHga/RX+9hTgqpvC3QbTng=
-SIZE (gmp-4.2.4.tar.gz) = 2294731
+MD5 (gmp-4.3.1.tar.gz) = qPYKyCOhbmEzXbqcCIdcBg==
+RMD160 (gmp-4.3.1.tar.gz) = uQjqsnyY6fCPw6nj9gkPxy9bT+8=
+SHA1 (gmp-4.3.1.tar.gz) = B5LmPzqm7tDNbqogBDFytcfk2P4=
+SHA256 (gmp-4.3.1.tar.gz) = f/ou58hfmYhEwQfbLszlWrS3OY9JovwNcwjj5sdP0eY=
+SIZE (gmp-4.3.1.tar.gz) = 2492100
diff --git a/devel/gmp/pkg/PFRAG.shared b/devel/gmp/pkg/PFRAG.shared
index 5012bbdc700..cd342bd0c0d 100644
--- a/devel/gmp/pkg/PFRAG.shared
+++ b/devel/gmp/pkg/PFRAG.shared
@@ -1,2 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.8 2006/01/06 20:30:26 bernd Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.9 2009/06/06 17:45:48 naddy Exp $
 @lib lib/libgmp.so.${LIBgmp_VERSION}
+@lib lib/libgmpxx.so.${LIBgmpxx_VERSION}
diff --git a/devel/gmp/pkg/PLIST b/devel/gmp/pkg/PLIST
index 868c65ea7b4..06b59535d16 100644
--- a/devel/gmp/pkg/PLIST
+++ b/devel/gmp/pkg/PLIST
@@ -1,6 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.6 2006/11/01 18:43:09 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.7 2009/06/06 17:45:48 naddy Exp $
 include/gmp.h
+include/gmpxx.h
 @info info/gmp.info
 lib/libgmp.a
 lib/libgmp.la
 %%SHARED%%
+lib/libgmpxx.a
+lib/libgmpxx.la