diff --git a/media-libs/faad2/faad2-2.7.recipe b/media-libs/faad2/faad2-2.7.recipe
index 9f84734f3..e121591c5 100644
--- a/media-libs/faad2/faad2-2.7.recipe
+++ b/media-libs/faad2/faad2-2.7.recipe
@@ -1,30 +1,75 @@
+SUMMARY="FAAD2 is an open source MPEG-4 and MPEG-2 AAC decoder"
 DESCRIPTION="FAAD2 is an open source MPEG-4 and MPEG-2 AAC decoder"
+
 HOMEPAGE="http://www.audiocoding.com/"
 SRC_URI="http://downloads.sourceforge.net/faac/faad2-2.7.tar.gz"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="ee1b4d67ea2d76ee52c5621bc6dbf61e"
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
+LICENSE="GNU GPL v2"
+COPYRIGHT="2003-2005 M. Bakker, Nero AG."
+
+CHECKSUM_SHA256="ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PATCHES="faad2-2.7.patch"
+
+PROVIDES="
+	faad2$secondaryArchSuffix = $portVersion compat >= 2.0
+	lib:libfaad$secondaryArchSuffix  = 2.0.0 compat >= 2
+	cmd:faad$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES="
+	haiku${secondaryArchSuffix} >= $haikuVersion
+"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:libtool
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+
+
+PATCH()
+{
+	sed -i 's/(LTCOMPILE) -c/(LTCOMPILE) -nostart/' libfaad/Makefile.in
+	sed -i 's/iquote/I/' libfaad/Makefile.am
+}
+
 BUILD()
 {
-	cd faad2-2.7
 	libtoolize --force --copy --install
 	aclocal
 	autoconf
-	MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
-	LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--libdir=$LIBDIR \
-		--mandir=$MANDIR
-	make
+
+	runConfigure ./configure
+	make $jobArgs
 }
 
 INSTALL()
 {
-	cd faad2-2.7
 	make install
+	prepareInstalledDevelLibs libfaad libmp4ff
+
+	# devel package
+	packageEntries devel \
+		$developDir
+
 }
 
-LICENSE="GNU GPL v2"
-COPYRIGHT="2003-2005 M. Bakker, Nero AG."
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	faad2${secondaryArchSuffix}_devel = $portVersion compat >= 2.0
+	devel:libfaad$secondaryArchSuffix = 2.0.0 compat >= 2
+	devel:libmp4ff$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	faad2$secondaryArchSuffix == $portVersion base
+	"
diff --git a/media-libs/faad2/patches/faad2-2.7.patch b/media-libs/faad2/patches/faad2-2.7.patch
index e5f4b63ce..e5a716041 100644
--- a/media-libs/faad2/patches/faad2-2.7.patch
+++ b/media-libs/faad2/patches/faad2-2.7.patch
@@ -6,8 +6,9 @@ diff -urN faad2-2.7.orig/configure.in faad2-2.7/configure.in
  AC_PROG_MAKE_SET
  AC_CHECK_PROGS(RPMBUILD, rpmbuild, rpm)
 +AC_CHECK_LIBM
- 
- AM_CONFIG_HEADER(config.h)
+
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADER(config.h)
  
 @@ -91,7 +92,7 @@
    ac_cv_c99_lrintf,
@@ -18,3 +19,4 @@ diff -urN faad2-2.7.orig/configure.in faad2-2.7/configure.in
  AC_TRY_LINK([
  #define         _ISOC9X_SOURCE  1
  #define         _ISOC99_SOURCE  1
+