Index: general.ent
===================================================================
--- general.ent	(revision 95cc4e4a7d0e30e8c8811f1d99919d61dfe084e6)
+++ general.ent	(revision 68c8cba0c93d230de0898d117221dfb4527d0c7d)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "11">                   <!-- Always 2 digits -->
+<!ENTITY day          "12">                   <!-- Always 2 digits -->
 <!ENTITY month        "08">                   <!-- Always 2 digits -->
 <!ENTITY year         "2007">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 95cc4e4a7d0e30e8c8811f1d99919d61dfe084e6)
+++ introduction/welcome/changelog.xml	(revision 68c8cba0c93d230de0898d117221dfb4527d0c7d)
@@ -41,4 +41,14 @@
 
 -->
+
+    <listitem>
+      <para>August 12th, 2007</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Added instructions to create an X11R6 symlink to the
+          X Windows Components page.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: multimedia/videoutils/mplayer.xml
===================================================================
--- multimedia/videoutils/mplayer.xml	(revision 95cc4e4a7d0e30e8c8811f1d99919d61dfe084e6)
+++ multimedia/videoutils/mplayer.xml	(revision 68c8cba0c93d230de0898d117221dfb4527d0c7d)
@@ -344,4 +344,7 @@
       </note>
 
+      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+      href="../../xincludes/X11R6_symlink.xml"/>
+
       <para><application>MPlayer</application> can build a shared
       post-processing library from the internal
Index: x/installing/x-setup.xml
===================================================================
--- x/installing/x-setup.xml	(revision 95cc4e4a7d0e30e8c8811f1d99919d61dfe084e6)
+++ x/installing/x-setup.xml	(revision 68c8cba0c93d230de0898d117221dfb4527d0c7d)
@@ -16,25 +16,64 @@
   <title>X Window System Components</title>
 
-    <sect2 role="configuration" id='xconfig'>
+  <para condition="html" role="usernotes">User Notes:
+  <ulink url='&blfs-wiki;/XWindowSystemComponents'/></para>
+
+  <sect2 role="configuration" id='X11R6-compat-symlink' 
+         xreflabel="Creating an X11R6 Compatibility Symlink">
+
+    <title>Creating an X11R6 Compatibility Symlink</title>
+
+    <para>Until recently (relatively speaking) almost every
+    <application>X Window</application> installation you performed or came
+    across was installed in the
+    <filename class='directory'>/usr/X11R6</filename> directory. That was the
+    standard for years. Developers picked up on this and wrote their package
+    installation scripts looking for <application>X</application> in the
+    standard location. Things have changed and the trend is to now install
+    <application>X</application> in
+    <filename class='directory'>/usr</filename>. Some people want to install
+    it in a custom location.</para>
+
+    <para>Many package developers have not caught up to the change and their
+    packages are still trying to find <application>X</application> in
+    <filename class='directory'>/usr/X11R6</filename> and subsequently fail
+    when you try to build the package. Though for most packages it is not
+    difficult to 'hack' the installation script to fix the problem, that is not
+    the long term solution to the problem. Upstream developers need to modernize
+    their installation scripts and eliminate the problem altogether.</para>
+
+    <para>Until then, you can create a symbolic link to satisfy the
+    <filename class='directory'>/usr/X11R6</filename> requirement so that you
+    won't be inconvenienced with a package build failure due to this known
+    issue. If you wish to create the symlink, issue the following command as
+    the <systemitem class="username">root</systemitem> user (ensure you modify
+    <replaceable>&lt;$XORG_PREFIX&gt;</replaceable> appropriately):</para>
+
+<screen role="root"><userinput>ln -vsf <replaceable>&lt;$XORG_PREFIX&gt;</replaceable> /usr/X11R6</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="configuration" id='xconfig'>
     <title>Configuring The X Window System</title>
 
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url='&blfs-wiki;/XWindowSystemComponents'/></para>
-
-    <para>If you've installed the X Window System in any prefix other
-    than <filename>/usr</filename>, as the
-    <systemitem class="username">root</systemitem> user, add
-    <filename class="directory">
-    <replaceable>&lt;/usr/X11R6&gt;</replaceable>/lib</filename> to
-    the <filename>/etc/ld.so.conf</filename> file and run
-    <command>ldconfig</command>.  Additionally, while still the
-    <systemitem class="username">root</systemitem> user, ensure
-    <filename class="directory">
-    <replaceable>&lt;/usr/X11R6&gt;</replaceable>/bin</filename>
-    and <filename class="directory">
-    <replaceable>&lt;/usr/X11R6&gt;</replaceable>/lib/pkgconfig</filename>
-    are added to your <envar>PATH</envar> and <envar>PKG_CONFIG_PATH</envar>
+    <para>If you've installed the X Window System in any prefix other than
+    <filename>/usr</filename>, become the <systemitem
+    class="username">root</systemitem> user and update the library linker's
+    cache by adding <filename class='directory'>/usr/X11R6/lib</filename>
+    to <filename>/etc/ld.so.conf</filename> and running
+    <command>ldconfig</command>.</para>
+
+    <para>Additionally, while still the <systemitem
+    class="username">root</systemitem> user, ensure
+    <filename class="directory">/usr/X11R6/bin</filename> and
+    <filename class="directory">/usr/X11R6/lib/pkgconfig</filename> are added
+    to the <envar>PATH</envar> and <envar>PKG_CONFIG_PATH</envar>
     environment variables, respectively. Instructions for doing this are
     described in the section <xref linkend='postlfs-config-profile'/>.</para>
+
+    <para>Ensure you replace
+    <filename class="directory">/usr/X11R6</filename> with
+    <envar>$XORG_PREFIX</envar> in the previous two paragraphs if you did not
+    create the compatibility symlink in the previous step.</para>
 
     <para>As the <systemitem class="username">root</systemitem> user
Index: xincludes/X11R6_symlink.xml
===================================================================
--- xincludes/X11R6_symlink.xml	(revision 68c8cba0c93d230de0898d117221dfb4527d0c7d)
+++ xincludes/X11R6_symlink.xml	(revision 68c8cba0c93d230de0898d117221dfb4527d0c7d)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
+
+    <!-- $LastChangedBy$ -->
+    <!-- $Date$ -->
+
+    <para>This package (unfortunately) expects the <application>X
+    Window</application> system to be installed in the
+    <filename class='directory'>/usr/X11R6</filename> directory. If you're
+    using a recent version of <application>Xorg</application> and it is
+    installed in any other location, ensure you have
+    followed the instructions in the <xref linkend="X11R6-compat-symlink"/>
+    section.</para>
