diff --git a/media-libs/libmad/libmad-0.15.1b.recipe b/media-libs/libmad/libmad-0.16.4.recipe
similarity index 62%
rename from media-libs/libmad/libmad-0.15.1b.recipe
rename to media-libs/libmad/libmad-0.16.4.recipe
index f25fa2334..fe9d1f9fa 100644
--- a/media-libs/libmad/libmad-0.15.1b.recipe
+++ b/media-libs/libmad/libmad-0.16.4.recipe
@@ -3,13 +3,14 @@ DESCRIPTION="MAD is a high-quality MPEG audio decoder. It currently supports \
 MPEG-1 and the MPEG-2 extension to lower sampling frequencies, as well as the \
 de facto MPEG 2.5 format. All three audio layers -- Layer I, Layer II, and \
 Layer III (i.e. MP3) -- are fully implemented."
-HOMEPAGE="http://mad.sourceforge.net/"
-COPYRIGHT="2000-2004 Underbit Technologies, Inc."
+HOMEPAGE="https://codeberg.org/tenacityteam/libmad"
+COPYRIGHT="2000-2004 Underbit Technologies, Inc.
+	2021-2024 Tenacity Team"
 LICENSE="GNU GPL v2"
-REVISION="8"
-SOURCE_URI="ftp://ftp.mars.org/pub/mpeg/libmad-0.15.1b.tar.gz"
-CHECKSUM_SHA256="bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690"
-PATCHES="libmad-$portVersion.patchset"
+REVISION="1"
+SOURCE_URI="https://codeberg.org/tenacityteam/libmad/archive/$portVersion.tar.gz"
+CHECKSUM_SHA256="f4eb229452252600ce48f3c2704c9e6d97b789f81e31c37b0c67dd66f445ea35"
+SOURCE_DIR="libmad"
 
 ARCHITECTURES="all"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -34,28 +35,23 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:autoconf
+	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
-	cmd:make
+	cmd:ninja
 	"
 
 BUILD()
 {
-	touch NEWS AUTHORS ChangeLog
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
-	sed -i 's/$optimize -fforce-mem/$optimize/g' configure.ac
-	autoreconf -vfi
-	runConfigure ./configure --disable-static
-	make $jobArgs
+	cmake -S . -B build -G Ninja \
+		$cmakeDirArgs \
+		-DCMAKE_BUILD_TYPE=Release
+	cmake --build build $jobArgs
 }
 
 INSTALL()
 {
-	make install
-
-	rm $libDir/libmad.la
+	cmake --install build
 
 	prepareInstalledDevelLibs libmad
 	fixPkgconfig
diff --git a/media-libs/libmad/patches/libmad-0.15.1b.patchset b/media-libs/libmad/patches/libmad-0.15.1b.patchset
deleted file mode 100644
index 78d8cb16b..000000000
--- a/media-libs/libmad/patches/libmad-0.15.1b.patchset
+++ /dev/null
@@ -1,69 +0,0 @@
-From d1a2ec4920a67b27e24c0f7a573c4da8e5e9993e Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Sun, 9 Jul 2017 21:31:30 +0200
-Subject: libmad, fix missing pkg-config file
-
-
-diff --git a/Makefile.am b/Makefile.am
-index ad5c596..bf617e3 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -21,7 +21,7 @@
- 
- ## Process this file with automake to produce Makefile.in
- 
--SUBDIRS =		
-+SUBDIRS =
- DIST_SUBDIRS =		msvc++
- 
- lib_LTLIBRARIES =	libmad.la
-@@ -30,7 +30,7 @@ include_HEADERS =	mad.h
- EXTRA_PROGRAMS =	minimad
- 
- minimad_SOURCES =	minimad.c
--minimad_INCLUDES =	
-+minimad_INCLUDES =
- minimad_LDADD =		libmad.la
- 
- EXTRA_DIST =		mad.h.sed  \
-@@ -59,6 +59,9 @@ INCLUDES =		$(FPM) $(ASO)
- BUILT_SOURCES =		mad.h
- CLEANFILES =		mad.h
- 
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = mad.pc
-+
- ## From the libtool documentation on library versioning:
- ##
- ## CURRENT
-diff --git a/configure.ac b/configure.ac
-index 9b79399..bbb8502 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -429,5 +429,5 @@ dnl LTLIBOBJS=`echo "$LIBOBJS" | sed -e 's/\.o/.lo/g'`
- dnl AC_SUBST(LTLIBOBJS)
- 
- AC_CONFIG_FILES([Makefile msvc++/Makefile  \
--	libmad.list])
-+	libmad.list mad.pc])
- AC_OUTPUT
-diff --git a/mad.pc.in b/mad.pc.in
-new file mode 100644
-index 0000000..6b906ba
---- /dev/null
-+++ b/mad.pc.in
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: mad
-+Description: MPEG Audio Decoder library
-+Requires:
-+Version: @VERSION@
-+Libs: -L${libdir} -lmad
-+Cflags: -I${includedir}
--- 
-2.7.0
-