diff --git a/audio/faac/faac.desc b/audio/faac/faac.desc
index c50b0f839..98345d78e 100644
--- a/audio/faac/faac.desc
+++ b/audio/faac/faac.desc
@@ -2,7 +2,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../faac/faac.desc
-[COPY] Copyright (C) 2006 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project
 [COPY] Copyright (C) 2006 The T2 SDE Project
 [COPY]
 [COPY] More information can be found in the files COPYING and README.
@@ -13,13 +13,13 @@
 [COPY] GNU General Public License can be found in the file COPYING.
 [COPY] --- SDE-COPYRIGHT-NOTE-END ---
 
-[I] An MPEG-4 AAC encoder and decoder
+[I] An MPEG-4 AAC encoder
 
-[T] The FAAC project includes the AAC encoder FAAC and decoder FAAD2. It
-[T] supports several MPEG-4 object types (LC, Main, LTP, HE AAC, PS)
-[T] and file formats (ADTS AAC, raw AAC, MP4), multichannel and gapless
-[T] en/decoding as well as MP4 metadata tags. The codecs are compatible with
-[T] standard-compliant audio applications using one or more of these profiles.
+[T] The FAAC project includes the AAC encoder FAAC. It supports several
+[T] MPEG-4 object types (LC, Main, LTP, HE AAC, PS) and file formats (ADTS
+[T] AAC, raw AAC, MP4), multichannel and gapless encoding as well as MP4
+[T] metadata tags. The codecs are compatible with standard-compliant audio
+[T] applications using one or more of these profiles.
 
 [U] http://www.audiocoding.com/
 
@@ -35,7 +35,4 @@
 [V] 1.25
 [P] X -----5---9 126.400
 
-[SRC] .
-
 [D] 2473347549 faac-1.25.tar.gz http://dl.sourceforge.net/sourceforge/faac/
-[D] 3128927071 faad2-2.5.tar.gz http://dl.sourceforge.net/sourceforge/faac/
diff --git a/audio/faad/faad.conf b/audio/faad/faad.conf
new file mode 100644
index 000000000..10b3acb6a
--- /dev/null
+++ b/audio/faad/faad.conf
@@ -0,0 +1,24 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../faad/faad.conf
+# Copyright (C) 2010 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License. A copy of the
+# GNU General Public License can be found in the file COPYING.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+bootstrap() {
+	aclocal -I .
+	autoheader
+	libtoolize --automake
+	automake --add-missing
+	autoconf
+}
+hook_add prepatch 3 "sed -i -e 's#\r##g' configure.in Makefile.am"
+hook_add preconf 3 "bootstrap"
+var_append confopt " " "--without-bmp"
diff --git a/audio/faad/faad.desc b/audio/faad/faad.desc
new file mode 100644
index 000000000..11c013da9
--- /dev/null
+++ b/audio/faad/faad.desc
@@ -0,0 +1,37 @@
+[COPY] --- SDE-COPYRIGHT-NOTE-BEGIN ---
+[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+[COPY]
+[COPY] Filename: package/.../faad/faad.desc
+[COPY] Copyright (C) 2010 The OpenSDE Project
+[COPY]
+[COPY] More information can be found in the files COPYING and README.
+[COPY]
+[COPY] This program is free software; you can redistribute it and/or modify
+[COPY] it under the terms of the GNU General Public License as published by
+[COPY] the Free Software Foundation; version 2 of the License. A copy of the
+[COPY] GNU General Public License can be found in the file COPYING.
+[COPY] --- SDE-COPYRIGHT-NOTE-END ---
+
+[I] An MPEG-4 AAC decoder
+
+[T] The FAAD project includes the AAC decoder FAAD2. It supports several
+[T] MPEG-4 object types (LC, Main, LTP, HE AAC, PS) and file formats (ADTS AAC,
+[T] raw AAC, MP4), multichannel and gapless ecoding as well as MP4 metadata
+[T] tags. The codecs are compatible with standard-compliant audio applications
+[T] using one or more of these profiles.
+
+[U] http://www.audiocoding.com/
+
+[A] Gian-Carlo Pascutto <gcp@users.sourceforge.net>
+[A] menno <menno@users.sourceforge.net>
+[A] Roberto Jose de Amorim <rjamorim@users.sourceforge.net>
+[M] The OpenSDE Community <list@opensde.org>
+
+[C] extra/multimedia
+
+[L] GPL
+[S] Stable
+[V] 2.5
+[P] X -----5---9 126.400
+
+[D] 3128927071 faad2-2.5.tar.gz http://dl.sourceforge.net/sourceforge/faac/
diff --git a/audio/faac/noplugins.patch.faad2 b/audio/faad/noplugins.patch
similarity index 95%
rename from audio/faac/noplugins.patch.faad2
rename to audio/faad/noplugins.patch
index f37d11f5e..6440e4931 100644
--- a/audio/faac/noplugins.patch.faad2
+++ b/audio/faad/noplugins.patch
@@ -1,8 +1,8 @@
 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
-# Filename: package/.../faac/noplugins.patch.faad2
-# Copyright (C) 2006 The OpenSDE Project
+# Filename: package/.../faad/noplugins.patch
+# Copyright (C) 2006 - 2010 The OpenSDE Project
 # Copyright (C) 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.