diff --git a/dev-libs/mpfr/mpfr-4.1.0.recipe b/dev-libs/mpfr/mpfr-4.1.0.recipe
new file mode 100644
index 000000000..f5c8a0983
--- /dev/null
+++ b/dev-libs/mpfr/mpfr-4.1.0.recipe
@@ -0,0 +1,90 @@
+SUMMARY="Multiple-precision floating-point computations with correct rounding"
+DESCRIPTION="The MPFR library is a C library for multiple-precision \
+floating-point computations with correct rounding. MPFR has continuously been \
+supported by the INRIA and the current main authors come from the Caramel and \
+AriC project-teams at Loria (Nancy, France) and LIP (Lyon, France) \
+respectively; see more on the credit page. MPFR is based on the GMP \
+multiple-precision library.
+
+The main goal of MPFR is to provide a library for multiple-precision \
+floating-point computation which is both efficient and has a well-defined \
+semantics. It copies the good ideas from the ANSI/IEEE-754 standard for \
+double-precision floating-point arithmetic (53-bit significand).
+
+MPFR is free. It is distributed under the GNU Lesser General Public License \
+(GNU Lesser GPL), version 3 or later (2.1 or later for MPFR versions until \
+2.4.x). The library has been registered in France by the Agence de Protection \
+des Programmes under the number IDDN FR 001 120020 00 R P 2000 000 10800, on \
+15 March 2000. This license guarantees your freedom to share and change MPFR, \
+to make sure MPFR is free for all its users. Unlike the ordinary General \
+Public License, the Lesser GPL enables developers of non-free programs to use \
+MPFR in their programs. If you have written a new function for MPFR or \
+improved an existing one, please share your work!"
+HOMEPAGE="https://www.mpfr.org"
+COPYRIGHT="2000-2020 Free Software Foundation, Inc."
+LICENSE="GNU LGPL v3"
+REVISION="1"
+SOURCE_URI="http://ftp.gnu.org/gnu/mpfr/mpfr-$portVersion.tar.bz2"
+CHECKSUM_SHA256="feced2d430dd5a97805fa289fed3fc8ff2b094c02d05287fd6133e7f1f0ec926"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64 sparc m68k"
+SECONDARY_ARCHITECTURES="x86 x86_gcc2"
+
+libVersion="6.1.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
+PROVIDES="
+	mpfr$secondaryArchSuffix = $portVersion
+	lib:libmpfr$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libgmp$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	mpfr${secondaryArchSuffix}_devel = $portVersion
+	devel:libmpfr$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	mpfr$secondaryArchSuffix == $portVersion base
+	devel:libgmp$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libgmp$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	autoconf_archive
+	cmd:aclocal
+	cmd:autoreconf
+	cmd:awk
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
+	cmd:makeinfo
+	"
+
+defineDebugInfoPackage mpfr$secondaryArchSuffix \
+	$libDir/libmpfr.so.$libVersion
+
+BUILD()
+{
+	autoreconf -fi
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	rm $libDir/libmpfr.la
+	prepareInstalledDevelLib libmpfr
+	packageEntries devel $developDir $libDir/pkgconfig
+}
+
+TEST()
+{
+	make check $jobArgs
+}
diff --git a/dev-libs/mpfr/mpfr-3.1.6.recipe b/dev-libs/mpfr/mpfr3-3.1.6.recipe
similarity index 91%
rename from dev-libs/mpfr/mpfr-3.1.6.recipe
rename to dev-libs/mpfr/mpfr3-3.1.6.recipe
index 73a5c63ca..ae428fc63 100644
--- a/dev-libs/mpfr/mpfr-3.1.6.recipe
+++ b/dev-libs/mpfr/mpfr3-3.1.6.recipe
@@ -23,16 +23,17 @@ improved an existing one, please share your work!"
 HOMEPAGE="https://www.mpfr.org"
 COPYRIGHT="2000-2014 INRIA"
 LICENSE="GNU LGPL v3"
-REVISION="4"
+REVISION="5"
 SOURCE_URI="http://ftp.gnu.org/gnu/mpfr/mpfr-$portVersion.tar.bz2"
 CHECKSUM_SHA256="cf4f4b2d80abb79e820e78c8077b6725bbbb4e8f41896783c899087be0e94068"
+SOURCE_DIR="mpfr-$portVersion"
 PATCHES="mpfr-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64 sparc m68k"
 SECONDARY_ARCHITECTURES="x86 x86_gcc2"
 
 PROVIDES="
-	mpfr$secondaryArchSuffix = $portVersion
+	mpfr3$secondaryArchSuffix = $portVersion
 	lib:libmpfr$secondaryArchSuffix = 4.1.6 compat >= 4
 	"
 REQUIRES="
@@ -41,13 +42,16 @@ REQUIRES="
 	"
 
 PROVIDES_devel="
-	mpfr${secondaryArchSuffix}_devel = $portVersion
+	mpfr3${secondaryArchSuffix}_devel = $portVersion
 	devel:libmpfr$secondaryArchSuffix = 4.1.6 compat >= 4
 	"
 REQUIRES_devel="
-	mpfr$secondaryArchSuffix == $portVersion base
+	mpfr3$secondaryArchSuffix == $portVersion base
 	devel:libgmp$secondaryArchSuffix
 	"
+CONFLICTS_devel="
+	mpfr${secondaryArchSuffix}_devel
+	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel