Index: general.ent
===================================================================
--- general.ent	(revision 744e7e9367978f43b816d6bbe7504e742fb98c8f)
+++ general.ent	(revision de3764fb83a16d18d31ebe835577d55d7793197f)
@@ -15,4 +15,5 @@
 <!ENTITY downloads-root "http://www.linuxfromscratch.org/blfs/downloads/svn">
 <!ENTITY downloads-project "http://downloads.linuxfromscratch.org">
+<!ENTITY downloads-anduin "http://anduin.linuxfromscratch.org/sources/BLFS/svn">
 <!ENTITY hints-root     "http://www.linuxfromscratch.org/hints">
 <!ENTITY patch-root     "http://www.linuxfromscratch.org/patches/blfs/svn">
Index: general/genutils/imagemagick.xml
===================================================================
--- general/genutils/imagemagick.xml	(revision 744e7e9367978f43b816d6bbe7504e742fb98c8f)
+++ general/genutils/imagemagick.xml	(revision de3764fb83a16d18d31ebe835577d55d7793197f)
@@ -62,4 +62,13 @@
       </listitem>
     </itemizedlist>
+
+    <para>The <application>ImageMagick</application> source releases are
+    updated frequently and the version shown above may no longer be available
+    from the download locations. You can download a more recent version and use
+    the existing BLFS instructions to install it. Chances are that it will
+    work just fine, but this has not been tested by the BLFS team. If the
+    package version shown above is not available from the locations shown
+    above, you can download it from the BLFS package server at
+    <ulink url="&downloads-anduin;/i"/>.</para>
 
     <bridgehead renderas="sect3">ImageMagick Dependencies</bridgehead>
Index: multimedia/libdriv/xine-lib.xml
===================================================================
--- multimedia/libdriv/xine-lib.xml	(revision 744e7e9367978f43b816d6bbe7504e742fb98c8f)
+++ multimedia/libdriv/xine-lib.xml	(revision de3764fb83a16d18d31ebe835577d55d7793197f)
@@ -9,6 +9,6 @@
   <!ENTITY xine-lib-md5sum        "b1f42602c776bb93e3cbf127e220cbfd">
   <!ENTITY xine-lib-size          "7.8 MB">
-  <!ENTITY xine-lib-buildsize     "87.7 MB">
-  <!ENTITY xine-lib-time          "3.2 SBU">
+  <!ENTITY xine-lib-buildsize     "105 MB">
+  <!ENTITY xine-lib-time          "5.0 SBU (with all optional dependencies installed)">
 ]>
 
@@ -84,4 +84,5 @@
     <xref linkend="gnome-vfs"/>,
     <xref linkend="samba3"/>,
+    <xref linkend="imagemagick"/>,
     <ulink url="http://www.directfb.org/">DirectFB</ulink>,
     <ulink url="http://www.theora.org/">Theora</ulink>,
@@ -93,6 +94,11 @@
     <ulink url="http://www.gnu.org/software/libcdio/">libcdio</ulink>,
     <ulink url="http://www.vcdimager.org/">VCDImager</ulink>,
-    <ulink url="http://sourceforge.net/projects/sgmltools-lite/">sgmltools-lite</ulink>
+    <ulink url="http://sourceforge.net/projects/sgmltools-lite/">sgmltools-lite</ulink>,
     and <ulink url="http://www.xfig.org/">Transfig</ulink></para>
+
+    <para>It is recommended that you use the internal source tree versions of
+    <application>FFmpeg</application>, <application>liba52</application>,
+    <application>libdvdnav</application> and <application>libmad</application>
+    and not system-installed versions.</para>
 
   </sect2>
@@ -111,10 +117,12 @@
     <command>configure</command> may not compile cleanly.</para>
 
-    <para>You will need to pass <command>configure</command> the option
-    <option>--with-xv-path=</option> if you didn't install
+    <para>You will need to pass
+    <option>--with-xv-path=<replaceable>[/directory/path]</replaceable></option>
+    to <command>configure</command> if you didn't install
     <application>Xorg</application> or <application>XFree86</application> in
-    <filename class='directory'>/usr/X11R6</filename>. For example, if you installed
-    <application>Xorg</application> in <filename class='directory'>/usr</filename>
-    you will need to use <option>--with-xv-path=/usr/lib</option>.</para>
+    <filename class='directory'>/usr/X11R6</filename>. For example, if you
+    installed <application>Xorg</application> in
+    <filename class='directory'>/usr</filename>, you will need to use
+    <option>--with-xv-path=/usr/lib</option>.</para>
 
     <para>This package does not come with a test suite.</para>
