diff --git a/sci-mathematics/gmp_ecm/gmp_ecm-7.0.4.recipe b/sci-mathematics/gmp_ecm/gmp_ecm-7.0.4.recipe
index fbb5aa2ef..467583635 100644
--- a/sci-mathematics/gmp_ecm/gmp_ecm-7.0.4.recipe
+++ b/sci-mathematics/gmp_ecm/gmp_ecm-7.0.4.recipe
@@ -2,24 +2,29 @@ SUMMARY="Elliptic Curve Method for Integer Factorization"
 DESCRIPTION="C implementation of the Elliptic Curve Method for factorizing integers"
 HOMEPAGE="http://ecm.gforge.inria.fr/"
 COPYRIGHT="2001-2016 GMP-ECM Authors"
-LICENSE="
-	GNU GPL v3
-	GNU LGPL v3
-	"
-REVISION="1"
-SOURCE_URI="https://gforge.inria.fr/frs/download.php/file/36224/ecm-$portVersion.tar.gz"
-CHECKSUM_SHA256="0cf7b3eee8462cc6f98b418b47630e1eb6b3f4f8c3fc1fb005b08e2a1811ba43"
+LICENSE="GNU GPL v3
+	GNU LGPL v3"
+REVISION="2"
+SOURCE_URI="https://gitlab.inria.fr/zimmerma/ecm/-/archive/$portVersion/ecm-$portVersion.tar.bz2"
+CHECKSUM_SHA256="950fd66ecd07efaacb8430c7c7c2b563e293209f183bab418dd82ca69fd98612"
 SOURCE_DIR="ecm-$portVersion"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
+commandBinDir=$binDir
+commandSuffix=$secondaryArchSuffix
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
 libVersion="1.0.0"
 libVersionCompat="$libVersion compat >= 1"
 
 PROVIDES="
 	gmp_ecm$secondaryArchSuffix = $portVersion
-	cmd:ecm$secondaryArchSuffix = $portVersion
+	cmd:ecm$commandSuffix = $portVersion
 	lib:libecm$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
@@ -30,7 +35,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	gmp_ecm${secondaryArchSuffix}_devel = $portVersion
-	devel:libecm$secondaryArchSuffix = $libVersion
+	devel:libecm$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	gmp_ecm$secondaryArchSuffix == $portVersion base
@@ -42,16 +47,24 @@ BUILD_REQUIRES="
 	devel:libgmp$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoreconf
 	cmd:awk
 	cmd:cmp
 	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:m4
 	cmd:make
 	"
 
 BUILD()
 {
-	runConfigure ./configure --enable-shared --enable-openmp
+	autoreconf -fi
+	runConfigure --omit-dirs binDir ./configure \
+		--bindir=$commandBinDir \
+		--enable-shared \
+		--enable-openmp \
+		--disable-static
 	make $jobArgs
 }