diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
new file mode 100644
index 00000000..f8087d3f
--- /dev/null
+++ b/media-libs/faad2/Manifest
@@ -0,0 +1,6 @@
+AUX faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch 305 RMD160 dae87cebd8a216b481b6ba308bfc0f8f7ceeb465 SHA1 1cf28cfd32dbae6cc484b149fd6adfea33506544 SHA256 c554313121f935aaabbe5b05addfc065bdf782bc0634ee9a91ceabde001ea823
+AUX faad2-2.7-libmp4ff-shared-lib.patch 867 RMD160 d0721533c875ef4e4510c56272953b0db1dfc4c2 SHA1 247658aa795cd6d44a153fae8c5cb62e427f3ecf SHA256 e0aaefeb20ebfec2f09e88a190f78e5744d9f1c71fe41977db8e4f29b5b88022
+AUX faad2-2.7-man1_MANS.patch 405 RMD160 a640012be5357bfc152e7ba7e045e61bdf9ab51a SHA1 4b548a08f7611a5f4f395c7c1d4cef5e37368af2 SHA256 e3e745cca309443d0149a09cc9988fec09c51e242b0e564afcb0af787dbb9031
+DIST faad2-2.7.tar.gz 1137407 RMD160 3f0ca461e2953014d5b17edccb3337767d478b8d SHA1 80eaaa5cc576c35dd28863767b795c50cbcc0511 SHA256 ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330
+EBUILD faad2-2.7-r2.ebuild 1191 RMD160 473c1aff16712272a5aeef57e6c43235f8458f42 SHA1 5266ddec644510e1130fdc84dfaf5eb066ee1aa3 SHA256 e42db6608d5459b28bd5869b1cbc67343d21146177050b22da06a3c34bb84933
+EBUILD faad2-2.7.ebuild 914 RMD160 137476bfd1149d97db921229602ffc503234acbe SHA1 049938bbe6e09b00c0ee2384eb3655fb61021d3b SHA256 2bb712edbaeb872c7f7e61282eb1655ad06db31ae7f6edb4b01daad1b28c57e2
diff --git a/media-libs/faad2/faad2-2.7-r2.ebuild b/media-libs/faad2/faad2-2.7-r2.ebuild
new file mode 100644
index 00000000..25dd50c2
--- /dev/null
+++ b/media-libs/faad2/faad2-2.7-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.7-r2.ebuild,v 1.1 2010/04/29 15:13:58 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils multilib-native flag-o-matic
+
+DESCRIPTION="AAC audio decoding library"
+HOMEPAGE="http://www.audiocoding.com/faad2.html"
+SRC_URI="mirror://sourceforge/faac/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="digitalradio"
+
+multilib-native_src_prepare_internal() {
+	epatch "${FILESDIR}"/${P}-libmp4ff-shared-lib.patch \
+		"${FILESDIR}"/${P}-libmp4ff-install-mp4ff_int_types_h.patch \
+		"${FILESDIR}"/${P}-man1_MANS.patch
+
+	sed -i -e 's:iquote :I:' libfaad/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib-native_src_configure_internal() {
+	append-flags "-DHAVE_LRINTF"
+	econf \
+		$(use_with digitalradio drm) \
+		--without-xmms
+}
+
+multilib-native_src_install_internal() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README README.linux TODO
+}
diff --git a/media-libs/faad2/faad2-2.7.ebuild b/media-libs/faad2/faad2-2.7.ebuild
new file mode 100644
index 00000000..8d7ee8ae
--- /dev/null
+++ b/media-libs/faad2/faad2-2.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.7.ebuild,v 1.10 2009/10/10 16:03:45 armin76 Exp $
+
+EAPI=2
+inherit autotools eutils multilib-native
+
+DESCRIPTION="AAC audio decoding library"
+HOMEPAGE="http://www.audiocoding.com/faad2.html"
+SRC_URI="mirror://sourceforge/faac/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+IUSE="digitalradio"
+
+multilib-native_src_prepare_internal() {
+	sed -i -e 's:iquote :I:' libfaad/Makefile.am || die "sed failed"
+	eautoreconf
+}
+
+multilib-native_src_configure_internal() {
+	econf \
+		$(use_with digitalradio drm) \
+		--without-xmms
+}
+
+multilib-native_src_install_internal() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README README.linux TODO
+}
diff --git a/media-libs/faad2/files/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch b/media-libs/faad2/files/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch
new file mode 100644
index 00000000..5d39cad9
--- /dev/null
+++ b/media-libs/faad2/files/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch
@@ -0,0 +1,13 @@
+Install mp4ff_int_types.h for mythmusic.
+
+http://bugs.gentoo.org/275008
+
+--- common/mp4ff/Makefile.am
++++ common/mp4ff/Makefile.am
+@@ -1,5 +1,5 @@
+ lib_LTLIBRARIES = libmp4ff.la
+-include_HEADERS = mp4ff.h mp4ffint.h
++include_HEADERS = mp4ff.h mp4ffint.h mp4ff_int_types.h
+ 
+ AM_CFLAGS = -DUSE_TAGGING=1
+ 
diff --git a/media-libs/faad2/files/faad2-2.7-libmp4ff-shared-lib.patch b/media-libs/faad2/files/faad2-2.7-libmp4ff-shared-lib.patch
new file mode 100644
index 00000000..56a13119
--- /dev/null
+++ b/media-libs/faad2/files/faad2-2.7-libmp4ff-shared-lib.patch
@@ -0,0 +1,29 @@
+Ripped from Debian
+
+Patch to create a shared lib for libmp4ff.
+
+--- a/common/mp4ff/Makefile.am
++++ b/common/mp4ff/Makefile.am
+@@ -1,7 +1,8 @@
+-lib_LIBRARIES = libmp4ff.a
++lib_LTLIBRARIES = libmp4ff.la
+ include_HEADERS = mp4ff.h mp4ffint.h
+ 
+-libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
++AM_CFLAGS = -DUSE_TAGGING=1
+ 
+-libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
++libmp4ff_la_LDFLAGS = -version-info 0:0:0
++libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
+ 		     mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h
+--- a/frontend/Makefile.am
++++ b/frontend/Makefile.am
+@@ -5,7 +5,7 @@
+ 	   -I$(top_srcdir)/common/mp4ff
+ 
+ faad_LDADD = $(top_builddir)/libfaad/libfaad.la \
+-	     $(top_builddir)/common/mp4ff/libmp4ff.a
++	     $(top_builddir)/common/mp4ff/libmp4ff.la
+ 
+ faad_SOURCES = main.c \
+ 	       audio.c audio.h \
diff --git a/media-libs/faad2/files/faad2-2.7-man1_MANS.patch b/media-libs/faad2/files/faad2-2.7-man1_MANS.patch
new file mode 100644
index 00000000..9c1ddb01
--- /dev/null
+++ b/media-libs/faad2/files/faad2-2.7-man1_MANS.patch
@@ -0,0 +1,10 @@
+diff -ur faad2-2.7.orig/frontend/Makefile.am faad2-2.7/frontend/Makefile.am
+--- faad2-2.7.orig/frontend/Makefile.am	2009-02-06 18:03:37.000000000 +0200
++++ faad2-2.7/frontend/Makefile.am	2009-07-20 20:27:29.000000000 +0300
+@@ -1,5 +1,5 @@
+ bin_PROGRAMS = faad
+-man_MANS = faad.man
++man1_MANS = faad.man
+ 
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/faad \
+ 	   -I$(top_srcdir)/common/mp4ff