diff --git a/dev-libs/gmp/gmp-5.1.3.recipe b/dev-libs/gmp/gmp-5.1.3.recipe
deleted file mode 100644
index e5a67c2e9..000000000
--- a/dev-libs/gmp/gmp-5.1.3.recipe
+++ /dev/null
@@ -1,75 +0,0 @@
-SUMMARY="The GNU multiple precision arithmetic library"
-DESCRIPTION="The GNU Multiple Precision Arithmetic Library (GMP) is a free \
-library for arbitrary-precision arithmetic, operating on signed integers, \
-rational numbers, and floating point numbers.
-
-There are no practical limits to the precision except the ones implied by \
-the available memory in the machine GMP runs on (operand dimension limit is \
-2^(32)-1 bits on 32-bit machines and 2^37 bits on 64-bit machines).
-GMP has a rich set of functions, and the functions have a regular interface. \
-The basic interface is for C but wrappers exist for other languages including \
-Ada, C++, C#, OCaml, Perl, PHP, and Python."
-HOMEPAGE="https://gmplib.org/"
-COPYRIGHT="1991-2013 Free Software Foundation, Inc."
-LICENSE="GNU GPL v3
-	GNU LGPL v3"
-REVISION="2"
-SOURCE_URI="https://gmplib.org/download/gmp/gmp-5.1.3.tar.xz"
-CHECKSUM_SHA256="dee2eda37f4ff541f30019932db0c37f6f77a30ba3609234933b1818f9b07071"
-
-ARCHITECTURES="all"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
-
-PROVIDES="
-	gmp$secondaryArchSuffix = $portVersion compat >= 5.1
-	lib:libgmp$secondaryArchSuffix = 10.1.3 compat >= 10
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	gmp${secondaryArchSuffix}_devel = $portVersion
-	devel:libgmp$secondaryArchSuffix = 10.1.3 compat >= 0
-	"
-REQUIRES_devel="
-	gmp$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:autoconf
-	cmd:automake
-	cmd:gcc$secondaryArchSuffix
-	cmd:libtool
-	cmd:make
-	"
-
-BUILD()
-{
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	automake --add-missing
-	runConfigure ./configure
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install includedir=$includeDir includeexecdir=$includeDir
-
-	# prepare devel/lib
-	prepareInstalledDevelLibs libgmp
-
-	# devel package
-	packageEntries devel \
-		$developDir
-}
-
-TEST()
-{
-	make check
-}
diff --git a/dev-libs/gmp/gmp-6.0.0.recipe b/dev-libs/gmp/gmp-6.0.0.recipe
index 078758cb6..5d37a319a 100644
--- a/dev-libs/gmp/gmp-6.0.0.recipe
+++ b/dev-libs/gmp/gmp-6.0.0.recipe
@@ -13,16 +13,19 @@ HOMEPAGE="https://gmplib.org/"
 COPYRIGHT="1991-2014 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3
 	GNU LGPL v3"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://gmplib.org/download/gmp/gmp-6.0.0a.tar.xz"
 CHECKSUM_SHA256="9156d32edac6955bc53b0218f5f3763facb890b73a835d5e1b901dcf8eb8b764"
 
 ARCHITECTURES="all"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
+libVersion="10.2.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	gmp$secondaryArchSuffix = $portVersion compat >= 6.0
-	lib:libgmp$secondaryArchSuffix = 10.2.0 compat >= 10
+	lib:libgmp$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -30,7 +33,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	gmp${secondaryArchSuffix}_devel = $portVersion
-	devel:libgmp$secondaryArchSuffix = 10.2.0 compat >= 10
+	devel:libgmp$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	gmp$secondaryArchSuffix == $portVersion base
@@ -53,7 +56,7 @@ BUILD()
 	aclocal
 	autoconf
 	automake --add-missing
-	runConfigure ./configure
+	runConfigure ./configure --disable-static
 	make $jobArgs
 }
 
@@ -61,6 +64,9 @@ INSTALL()
 {
 	make install includedir=$includeDir includeexecdir=$includeDir
 
+	# remove libtool file
+	rm -f $libDir/libgmp.la
+
 	# prepare devel/lib
 	prepareInstalledDevelLibs libgmp
 
diff --git a/dev-libs/gmp/gmp-6.1.2.recipe b/dev-libs/gmp/gmp-6.1.2.recipe
deleted file mode 100644
index b146c8dfc..000000000
--- a/dev-libs/gmp/gmp-6.1.2.recipe
+++ /dev/null
@@ -1,78 +0,0 @@
-SUMMARY="The GNU multiple precision arithmetic library"
-DESCRIPTION="The GNU Multiple Precision Arithmetic Library (GMP) is a free \
-library for arbitrary-precision arithmetic, operating on signed integers, \
-rational numbers, and floating point numbers.
-
-There are no practical limits to the precision except the ones implied by \
-the available memory in the machine GMP runs on (operand dimension limit is \
-2^(32)-1 bits on 32-bit machines and 2^37 bits on 64-bit machines).
-GMP has a rich set of functions, and the functions have a regular interface. \
-The basic interface is for C but wrappers exist for other languages including \
-Ada, C++, C#, OCaml, Perl, PHP, and Python."
-HOMEPAGE="https://gmplib.org/"
-COPYRIGHT="1991-2014 Free Software Foundation, Inc."
-LICENSE="GNU GPL v3
-	GNU LGPL v3"
-REVISION="3"
-SOURCE_URI="https://gmplib.org/download/gmp/gmp-$portVersion.tar.xz"
-CHECKSUM_SHA256="87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912"
-
-ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	gmp$secondaryArchSuffix = $portVersion compat >= 6.0
-	lib:libgmp$secondaryArchSuffix = 10.3.2 compat >= 10
-	lib:libgmpxx$secondaryArchSuffix = 4.5.2 compat >= 4
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	gmp${secondaryArchSuffix}_devel = $portVersion
-	devel:libgmp$secondaryArchSuffix = 10.3.2 compat >= 10
-	devel:libgmpxx$secondaryArchSuffix = 4.5.2 compat >= 4
-	"
-REQUIRES_devel="
-	gmp$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:autoconf
-	cmd:automake
-	cmd:gcc$secondaryArchSuffix
-	cmd:libtool
-	cmd:make
-	"
-
-BUILD()
-{
-	touch doc/*.info*
-	autoreconf -fi
-	runConfigure ./configure --enable-cxx
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install includedir=$includeDir includeexecdir=$includeDir
-
-	# remove libtool files
-	rm $libDir/*.la
-
-	# prepare devel/lib
-	prepareInstalledDevelLibs libgmp libgmpxx
-
-	# devel package
-	packageEntries devel \
-		$developDir
-}
-
-TEST()
-{
-	make $jobArgs check
-}