diff --git a/general.ent b/general.ent
index 397d4a2d75..0cd76ce80d 100644
--- a/general.ent
+++ b/general.ent
@@ -3,7 +3,7 @@ $LastChangedBy$
 $Date$
 -->
 
-<!ENTITY day          "10">                   <!-- Always 2 digits -->
+<!ENTITY day          "19">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2008">
 <!ENTITY version      "svn-&year;&month;&day;">
@@ -617,6 +617,7 @@ $Date$
 <!ENTITY libao-version                "0.8.8">
 <!ENTITY libogg-version               "1.1.3">
 <!ENTITY libvorbis-version            "1.2.0">
+<!ENTITY faad2-version                "2.6.1">
 <!ENTITY nas-version                  "1.9">
 <!ENTITY libmpeg3-version             "1.7">
 <!ENTITY libmad-version               "0.15.1b">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 96d9daf561..6dd3159fe9 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,15 @@
 
 -->
 
+    <listitem>
+      <para>January 19th, 2008</para>
+      <itemizedlist>
+        <listitem>
+          <para>[alexander] - Added FAAD2.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>January 10th, 2008</para>
       <itemizedlist>
diff --git a/multimedia/libdriv/gst-plugins.xml b/multimedia/libdriv/gst-plugins.xml
index 1547fc6269..2287a5aedb 100644
--- a/multimedia/libdriv/gst-plugins.xml
+++ b/multimedia/libdriv/gst-plugins.xml
@@ -96,7 +96,7 @@
     <ulink url="http://www.comedi.org/cgi-bin/viewcvs.cgi/audioresample/">audioresample</ulink>,
     <xref linkend="esound"/>,
     <ulink url="http://sourceforge.net/projects/faac">FAAC</ulink>,
-    <ulink url="http://sourceforge.net/projects/faac">FAAD2</ulink>,
+    <xref linkend="faad2"/>,
     <xref linkend="flac"/>,
     <ulink url="http://kbs.cs.tu-berlin.de/~jutta/toast.html">GSM</ulink>,
     <ulink url="http://jackit.sourceforge.net/">JACK</ulink>,
diff --git a/multimedia/libdriv/libdriv.xml b/multimedia/libdriv/libdriv.xml
index 9b3cad13c6..89763ec080 100644
--- a/multimedia/libdriv/libdriv.xml
+++ b/multimedia/libdriv/libdriv.xml
@@ -35,6 +35,7 @@ $Date$
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libao.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libogg.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libvorbis.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="faad2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nas.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libmpeg3.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libmad.xml"/>
diff --git a/multimedia/libdriv/libquicktime.xml b/multimedia/libdriv/libquicktime.xml
index 67c15f79cb..00ed3a4fd2 100644
--- a/multimedia/libdriv/libquicktime.xml
+++ b/multimedia/libdriv/libquicktime.xml
@@ -74,7 +74,7 @@
     <xref linkend="ffmpeg"/>,
     <ulink url="http://developers.videolan.org/x264.html">x264</ulink>,
     <ulink url="http://sourceforge.net/projects/faac">FAAC</ulink>, and
-    <ulink url="http://sourceforge.net/projects/faac">FAAD2</ulink></para>
+    <xref linkend="faad2"/>.</para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/libquicktime"/></para>
diff --git a/multimedia/videoutils/avifile.xml b/multimedia/videoutils/avifile.xml
index c8229a4c8b..85ee2e4374 100644
--- a/multimedia/videoutils/avifile.xml
+++ b/multimedia/videoutils/avifile.xml
@@ -100,7 +100,7 @@
     <xref linkend="lame"/>,
     <xref linkend="libmad"/>,
     <xref linkend="xvid"/>,
-    <ulink url="http://sourceforge.net/projects/faac">FAAD2</ulink>,
+    <xref linkend="faad2"/>,
     <!-- Adding this comment in case this package gets any momentum and
          actually get an updated DivX. Here is the new URL to the new codec:
          http://labs.divx.com/DivXLinuxCodec -->
diff --git a/multimedia/videoutils/ffmpeg.xml b/multimedia/videoutils/ffmpeg.xml
index a3c192ffba..ff15b15df2 100644
--- a/multimedia/videoutils/ffmpeg.xml
+++ b/multimedia/videoutils/ffmpeg.xml
@@ -83,7 +83,7 @@
     <ulink url="http://www.penguin.cz/~utx/amr">AMR narrowband (floating point)</ulink>,
     <ulink url="http://www.penguin.cz/~utx/amr">AMR wideband</ulink>,
     <ulink url="http://sourceforge.net/projects/faac">FAAC</ulink>,
-    <ulink url="http://sourceforge.net/projects/faac">FAAD2</ulink>,
+    <xref linkend="faad2"/>,
     <xref linkend="freetype2"/>,
     <ulink url="http://kbs.cs.tu-berlin.de/~jutta/gsm/">GSM</ulink>,
     <xref linkend="imlib2"/>,
diff --git a/multimedia/videoutils/mplayer.xml b/multimedia/videoutils/mplayer.xml
index 754a628ebf..bed1332c8b 100644
--- a/multimedia/videoutils/mplayer.xml
+++ b/multimedia/videoutils/mplayer.xml
@@ -215,7 +215,7 @@
       AMR wideband</ulink>,
       <!-- Dead link <ulink url="http://www.divx.com/divx/linux/">DivX</ulink>, i-->
     <ulink url="http://sourceforge.net/projects/faac">FAAC</ulink>,
-    <ulink url="http://sourceforge.net/projects/faac">FAAD2</ulink> (must disable the internal version),
+    <xref linkend="faad2"/> (must disable the internal version),
     <xref linkend="ffmpeg"/>,
     <xref linkend="lame"/>,
     <ulink url="http://developers.videolan.org/libdca.html">libdca</ulink>,