diff --git a/media-libs/libsamplerate/libsamplerate-0.1.9.recipe b/media-libs/libsamplerate/libsamplerate-0.2.1.recipe
similarity index 70%
rename from media-libs/libsamplerate/libsamplerate-0.1.9.recipe
rename to media-libs/libsamplerate/libsamplerate-0.2.1.recipe
index a9622692b..2c75d5400 100644
--- a/media-libs/libsamplerate/libsamplerate-0.1.9.recipe
+++ b/media-libs/libsamplerate/libsamplerate-0.2.1.recipe
@@ -9,13 +9,12 @@ by a factor of 256 to upsampling by the same factor. Arbitrary in this case \
 means that the ratio of input and output sample rates can be an irrational \
 number. The conversion ratio can also vary with time for speeding up and \
 slowing down effects."
-HOMEPAGE="http://www.mega-nerd.com/SRC/"
-COPYRIGHT="2002-2011 Erik de Castro Lopo"
-LICENSE="GNU GPL v2"
-REVISION="2"
-SOURCE_URI="http://www.mega-nerd.com/SRC/libsamplerate-$portVersion.tar.gz"
-CHECKSUM_SHA256="0a7eb168e2f21353fb6d84da152e4512126f7dc48ccb0be80578c565413444c1"
-PATCHES="libsamplerate-$portVersion.patchset"
+HOMEPAGE="http://libsndfile.github.io/libsamplerate/"
+COPYRIGHT="2002-2021 Erik de Castro Lopo"
+LICENSE="BSD (2-clause)"
+REVISION="1"
+SOURCE_URI="https://github.com/libsndfile/libsamplerate/releases/download/$portVersion/libsamplerate-$portVersion.tar.bz2"
+CHECKSUM_SHA256="f6323b5e234753579d70a0af27796dde4ebeddf58aae4be598e39b3cee00c90a"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -23,7 +22,7 @@ SECONDARY_ARCHITECTURES="x86"
 PROVIDES="
 	libsamplerate$secondaryArchSuffix = $portVersion compat >= 0
 	cmd:sndfile_resample$secondaryArchSuffix
-	lib:libsamplerate$secondaryArchSuffix = 0.1.8 compat >= 0
+	lib:libsamplerate$secondaryArchSuffix = $portVersion compat >= 0
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -31,7 +30,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libsamplerate${secondaryArchSuffix}_devel = $portVersion compat >= 0
-	devel:libsamplerate$secondaryArchSuffix = 0.1.8 compat >= 0
+	devel:libsamplerate$secondaryArchSuffix = $portVersion compat >= 0
 	"
 REQUIRES_devel="
 	libsamplerate$secondaryArchSuffix == $portVersion base
@@ -41,20 +40,18 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
+	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
 BUILD()
 {
-	autoreconf -fi
-	runConfigure ./configure
+	cmake $cmakeDirArgs \
+		  -DBUILD_SHARED_LIBS=TRUE \
+		  .
 	make $jobArgs
 }
 
@@ -62,8 +59,6 @@ INSTALL()
 {
 	make install
 
-	rm $libDir/libsamplerate.la
-
 	prepareInstalledDevelLibs libsamplerate
 	fixPkgconfig
 
@@ -72,3 +67,8 @@ INSTALL()
 		$docDir \
 		$developDir
 }
+
+TEST()
+{
+	make test
+}
diff --git a/media-libs/libsamplerate/patches/libsamplerate-0.1.9.patchset b/media-libs/libsamplerate/patches/libsamplerate-0.1.9.patchset
deleted file mode 100644
index 7f703a769..000000000
--- a/media-libs/libsamplerate/patches/libsamplerate-0.1.9.patchset
+++ /dev/null
@@ -1,50 +0,0 @@
-From e4d5844b5a2993dd04e3fc784f035b97c09bef7f Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Mon, 25 May 2015 18:00:05 +0000
-Subject: Haiku patch
-
-
-diff --git a/M4/lrint.m4 b/M4/lrint.m4
-index 3e3319e..bd8be74 100644
---- a/M4/lrint.m4
-+++ b/M4/lrint.m4
-@@ -15,7 +15,7 @@ AC_DEFUN([AC_C99_FUNC_LRINT],
-   ac_cv_c99_lrint,
- [
- lrint_save_CFLAGS=$CFLAGS
--CFLAGS="-lm"
-+#CFLAGS="-lm"
- AC_TRY_LINK([
- #define		_ISOC9X_SOURCE	1
- #define 	_ISOC99_SOURCE	1
-diff --git a/M4/lrintf.m4 b/M4/lrintf.m4
-index f921e9e..d3fcf58 100644
---- a/M4/lrintf.m4
-+++ b/M4/lrintf.m4
-@@ -15,7 +15,7 @@ AC_DEFUN([AC_C99_FUNC_LRINTF],
-   ac_cv_c99_lrintf,
- [
- lrintf_save_CFLAGS=$CFLAGS
--CFLAGS="-lm"
-+#CFLAGS="-lm"
- AC_TRY_LINK([
- #define		_ISOC9X_SOURCE	1
- #define 	_ISOC99_SOURCE	1
-diff --git a/configure.ac b/configure.ac
-index 4a718c5..35506a9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -267,8 +267,8 @@ htmldocdir=$prefix/share/doc/libsamplerate0-dev/html
- if test $prefix = "NONE" ; then
- 	htmldocdir=/usr/local/share/doc/libsamplerate0-dev/html
- else
--	htmldocdir=$prefix/share/doc/libsamplerate0-dev/html
--	fi
-+	htmldocdir=$docdir/libsamplerate0-dev/html
-+fi
- 
- #====================================================================================
- # Now use the information from the checking stage.
--- 
-1.8.3.4
-