diff --git a/general.ent b/general.ent
index 981a002c68..b772745b7c 100644
--- a/general.ent
+++ b/general.ent
@@ -668,7 +668,7 @@ $Date$
 <!ENTITY libao-version                "0.8.8">
 <!ENTITY libogg-version               "1.1.4">
 <!ENTITY libvorbis-version            "1.2.3">
-<!ENTITY faad2-version                "2.6.1">
+<!ENTITY faad2-version                "2.7">
 <!ENTITY faac-version                 "1.28">
 <!ENTITY nas-version                  "1.9.1">
 <!ENTITY libmpeg3-version             "1.8">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index bd29724a8a..668e8a399d 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -43,6 +43,9 @@
     <listitem>
       <para>August 4th, 2009</para>
       <itemizedlist>
+        <listitem>
+          <para>[gdalziel] - Updated to FAAD2-2.7.</para>
+        </listitem>
         <listitem>
           <para>[gdalziel] - Updated to FAAC-1.28. Added a patch to fix a
           function conflict with Glibc.</para>
diff --git a/multimedia/libdriv/faad2.xml b/multimedia/libdriv/faad2.xml
index 381db27ad8..db8a7c9a50 100644
--- a/multimedia/libdriv/faad2.xml
+++ b/multimedia/libdriv/faad2.xml
@@ -5,11 +5,11 @@
   %general-entities;
 
   <!ENTITY faad2-download-http "&sourceforge-repo;/faac/faad2-&faad2-version;.tar.gz">
-  <!ENTITY faad2-download-ftp  " ">
-  <!ENTITY faad2-md5sum        "74e92df40c270f216a8305fc87603c8a">
-  <!ENTITY faad2-size          "820 KB">
-  <!ENTITY faad2-buildsize     "15 MB (without media player plugins)">
-  <!ENTITY faad2-time          "0.3 SBU (without media player plugins)">
+  <!ENTITY faad2-download-ftp  "&gentoo-ftp-repo;/faad2-&faad2-version;.tar.gz">
+  <!ENTITY faad2-md5sum        "ee1b4d67ea2d76ee52c5621bc6dbf61e">
+  <!ENTITY faad2-size          "1.1 MB">
+  <!ENTITY faad2-buildsize     "12 MB (without media player plugins)">
+  <!ENTITY faad2-time          "0.2 SBU (without media player plugins)">
 ]>
 
 <sect1 id="faad2" xreflabel="FAAD2-&faad2-version;">
@@ -33,6 +33,8 @@
     compression scheme specified in MPEG-2 Part 7 and MPEG-4 Part 3 standards
     and known as Advanced Audio Coding (AAC).</para>
 
+    &lfs65_checked;
+
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -80,8 +82,7 @@
     <para>Install <application>FAAD2</application> by running the
     following commands:</para>
 
-<screen><userinput>./bootstrap &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
     <para>This package does not come with a test suite. However, basic
@@ -122,9 +123,9 @@ ADTS, 4.608 sec, 13 kbps, 16000 Hz
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><command>./bootstrap</command>: This command runs GNU Autotools
+    <!-- <para><command>./bootstrap</command>: This command runs GNU Autotools
     to create the <command>configure</command> script and other
-    required build files.</para>
+    required build files.</para> -->
 
     <para><option>--with-drm</option>: This option is supposed to enable
     support for decoding