diff --git a/media-libs/faad2/faad2-2.8.8.recipe b/media-libs/faad2/faad2-2.9.1.recipe
similarity index 89%
rename from media-libs/faad2/faad2-2.8.8.recipe
rename to media-libs/faad2/faad2-2.9.1.recipe
index 24ca8f77e..757008d97 100644
--- a/media-libs/faad2/faad2-2.8.8.recipe
+++ b/media-libs/faad2/faad2-2.9.1.recipe
@@ -8,8 +8,9 @@ HOMEPAGE="https://www.audiocoding.com/"
 COPYRIGHT="2003-2005 M. Bakker, Nero AG."
 LICENSE="GNU GPL v2"
 REVISION="1"
-SOURCE_URI="https://downloads.sourceforge.net/faac/faad2-$portVersion.tar.gz"
-CHECKSUM_SHA256="985c3fadb9789d2815e50f4ff714511c79c2710ac27a4aaaf5c0c2662141426d"
+SOURCE_URI="https://github.com/knik0/faad2/archive/${portVersion//./_}.tar.gz"
+CHECKSUM_SHA256="7fa33cff76abdda5a220ca5de0b2e05a77354f3b97f735193c2940224898aa9a"
+SOURCE_DIR="faad2-${portVersion//./_}"
 PATCHES="faad2-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
diff --git a/media-libs/faad2/patches/faad2-2.8.8.patchset b/media-libs/faad2/patches/faad2-2.8.8.patchset
deleted file mode 100644
index 27b59a957..000000000
--- a/media-libs/faad2/patches/faad2-2.8.8.patchset
+++ /dev/null
@@ -1,76 +0,0 @@
-From afac2897dbb4818461f1e8bd721c2a839cb3adf6 Mon Sep 17 00:00:00 2001
-From: Robert Kausch <robert.kausch@freac.org>
-Date: Tue, 4 Dec 2018 20:46:05 +0000
-Subject: Patches for Haiku compatibility.
-
-
-diff --git a/configure.ac b/configure.ac
-index a03cafe..b03022d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,6 +25,7 @@ AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
- AC_CHECK_PROGS(RPMBUILD, rpmbuild, rpm)
-+AC_CHECK_LIBM
- 
- AC_CONFIG_HEADERS([config.h])
- 
-@@ -92,7 +93,7 @@ AC_DEFUN([AC_C99_FUNC_LRINTF],
-   ac_cv_c99_lrintf,
- [
- lrintf_save_CFLAGS=$CFLAGS
--CFLAGS="-O -lm"
-+CFLAGS="-O $LIBM"
- AC_TRY_LINK([
- #define         _ISOC9X_SOURCE  1
- #define         _ISOC99_SOURCE  1
-diff --git a/frontend/mp4read.c b/frontend/mp4read.c
-index 9767383..57b7fac 100644
---- a/frontend/mp4read.c
-+++ b/frontend/mp4read.c
-@@ -51,8 +51,10 @@ static inline uint32_t bswap32(const uint32_t u32)
- #ifndef WORDS_BIGENDIAN
- #ifdef _MSC_VER
- 	return _byteswap_ulong(u32);
--#else
-+#elif defined (__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))
-     return __builtin_bswap32(u32);
-+#else
-+	return (u32 << 24) | ((u32 << 8) & 0xFF0000) | ((u32 >> 8) & 0xFF00) | (u32 >> 24);
- #endif
- #else
- 	return u32;
-@@ -64,8 +66,10 @@ static inline uint16_t bswap16(const uint16_t u16)
- #ifndef WORDS_BIGENDIAN
- #ifdef _MSC_VER
- 	return _byteswap_ushort(u16);
--#else
-+#elif defined (__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 8)))
- 	return __builtin_bswap16(u16);
-+#else
-+	return (u16 << 8) | (u16 >> 8);
- #endif
- #else
- 	return u16;
-diff --git a/libfaad/Makefile.am b/libfaad/Makefile.am
-index 8ed57ae..aa9c745 100644
---- a/libfaad/Makefile.am
-+++ b/libfaad/Makefile.am
-@@ -1,12 +1,11 @@
- lib_LTLIBRARIES = libfaad.la libfaad_drm.la
- 
--AM_CPPFLAGS	= -iquote $(top_srcdir)/include
-+AM_CPPFLAGS	= -I $(top_srcdir)/include
- include_HEADERS = $(top_srcdir)/include/faad.h \
- 		  $(top_srcdir)/include/neaacdec.h
- 
- libfaad_la_LDFLAGS = -version-info 2:0:0 -no-undefined
- libfaad_la_LIBADD = -lm
--libfaad_la_CFLAGS = -fvisibility=hidden
- 
- libfaad_la_SOURCES = bits.c cfft.c decoder.c drc.c \
- 		     drm_dec.c error.c filtbank.c \
--- 
-2.19.1
-
diff --git a/media-libs/faad2/patches/faad2-2.9.1.patchset b/media-libs/faad2/patches/faad2-2.9.1.patchset
new file mode 100644
index 000000000..5b4026387
--- /dev/null
+++ b/media-libs/faad2/patches/faad2-2.9.1.patchset
@@ -0,0 +1,39 @@
+From 3ca94abde60d8da2ab91b996970e79be54a0245e Mon Sep 17 00:00:00 2001
+From: Robert Kausch <robert.kausch@freac.org>
+Date: Tue, 4 Dec 2018 20:46:05 +0000
+Subject: Patches for Haiku compatibility.
+
+
+diff --git a/configure.ac b/configure.ac
+index 44faa0c..a8b9241 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,6 +25,7 @@ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+ AC_CHECK_PROGS(RPMBUILD, rpmbuild, rpm)
++AC_CHECK_LIBM
+ 
+ AC_CONFIG_HEADERS([config.h])
+ 
+diff --git a/libfaad/Makefile.am b/libfaad/Makefile.am
+index 8ed57ae..aa9c745 100644
+--- a/libfaad/Makefile.am
++++ b/libfaad/Makefile.am
+@@ -1,12 +1,11 @@
+ lib_LTLIBRARIES = libfaad.la libfaad_drm.la
+ 
+-AM_CPPFLAGS	= -iquote $(top_srcdir)/include
++AM_CPPFLAGS	= -I $(top_srcdir)/include
+ include_HEADERS = $(top_srcdir)/include/faad.h \
+ 		  $(top_srcdir)/include/neaacdec.h
+ 
+ libfaad_la_LDFLAGS = -version-info 2:0:0 -no-undefined
+ libfaad_la_LIBADD = -lm
+-libfaad_la_CFLAGS = -fvisibility=hidden
+ 
+ libfaad_la_SOURCES = bits.c cfft.c decoder.c drc.c \
+ 		     drm_dec.c error.c filtbank.c \
+-- 
+2.24.0
+