Index: general.ent
===================================================================
--- general.ent	(revision d603c3da67d8d7badbec744872b8bfb03ca9b807)
+++ general.ent	(revision f67fa9df49a1a0d75e526809ee0b2060a090d0a9)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "06">                   <!-- Always 2 digits -->
+<!ENTITY day          "07">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2008">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision d603c3da67d8d7badbec744872b8bfb03ca9b807)
+++ introduction/welcome/changelog.xml	(revision f67fa9df49a1a0d75e526809ee0b2060a090d0a9)
@@ -41,4 +41,15 @@
 
 -->
+
+    <listitem>
+      <para>May 7th, 2008</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Completed cleanup for /etc/X11 and /usr/X11R6
+          removal.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>May 6th, 2008</para>
@@ -48,9 +59,10 @@
         </listitem>
         <listitem>
-          <para>[dj] - Chaned jdk symlink to use precompiled version and
+          <para>[dj] - Changed jdk symlink to use precompiled version and
           other text cleanups in jdk page.</para>
         </listitem>
         <listitem>
-          <para>[thomas] - Updated to QT-3.3.8b (bugfix release with applied UTF patch).</para>
+          <para>[thomas] - Updated to QT-3.3.8b (bugfix release with applied
+          UTF patch).</para>
         </listitem>
       </itemizedlist>
@@ -126,5 +138,6 @@
         </listitem>
         <listitem>
-          <para>[bdubbs] - Ensure /etc/X11/app-defaults exists in rxvt-unicode.</para>
+          <para>[bdubbs] - Ensure /etc/X11/app-defaults exists in
+          rxvt-unicode.</para>
         </listitem>
         <listitem>
@@ -254,6 +267,6 @@
         </listitem>
         <listitem>
-          <para>[ag] - Added a sed to the ed instructions to replace with symbolic
-          links the hard links to red and its man page.</para>
+          <para>[ag] - Added a sed to the ed instructions to replace with
+          symbolic links the hard links to red and its man page.</para>
         </listitem>
       </itemizedlist>
@@ -273,5 +286,6 @@
       <itemizedlist>
         <listitem>
-          <para>[cwurst] - Changed download location of gimp-help. Fixes #2503.</para>
+          <para>[cwurst] - Changed download location of gimp-help. Fixes
+          #2503.</para>
         </listitem>
       </itemizedlist>
@@ -356,5 +370,6 @@
       <itemizedlist>
         <listitem>
-          <para>[bdubbs] - Expanded the discussion on autofs configuration.</para>
+          <para>[bdubbs] - Expanded the discussion on autofs
+          configuration.</para>
         </listitem>
         <listitem>
@@ -499,5 +514,6 @@
         </listitem>
         <listitem>
-          <para>[alexander] - Fixed URL for Audacious third-party plugins.</para>
+          <para>[alexander] - Fixed URL for Audacious third-party
+          plugins.</para>
         </listitem>
         <listitem>
@@ -712,5 +728,6 @@
         </listitem>
         <listitem>
-          <para>[bdubbs] - Fixed problem with netfs bootscript boot procedure.</para>
+          <para>[bdubbs] - Fixed problem with netfs bootscript boot
+          procedure.</para>
         </listitem>
         <listitem>
Index: multimedia/libdriv/nas.xml
===================================================================
--- multimedia/libdriv/nas.xml	(revision d603c3da67d8d7badbec744872b8bfb03ca9b807)
+++ multimedia/libdriv/nas.xml	(revision f67fa9df49a1a0d75e526809ee0b2060a090d0a9)
@@ -83,4 +83,7 @@
     <title>Installation of NAS</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/X11R6_symlink.xml"/>
+
     <para>Install <application>NAS</application> by running the
     following commands:</para>
@@ -158,4 +161,5 @@
 <screen role="root"><userinput>make install-nas</userinput></screen>
 
+<!-- XFREE86
       <para>The init script uses a default prefix of
       <filename class="directory">/usr/X11R6</filename>.  If you've installed
@@ -166,4 +170,6 @@
 
 <screen role="root"><userinput>sed -i 's@/usr/X11R6@<replaceable>&lt;PREFIX&gt;</replaceable>@' /etc/rc.d/init.d/nas</userinput></screen>
+
+XFREE86 -->
 
       <para>The init script uses a default parameter to allow access to all
Index: x/installing/xorg7.xml
===================================================================
--- x/installing/xorg7.xml	(revision d603c3da67d8d7badbec744872b8bfb03ca9b807)
+++ x/installing/xorg7.xml	(revision f67fa9df49a1a0d75e526809ee0b2060a090d0a9)
@@ -148,15 +148,21 @@
     --mandir=$XORG_PREFIX/share/man --localstatedir=/var"</userinput></screen>
 
+    <note>
+      <para>Make sure that you also add these variables to your personal or
+      system-wide profile as they are used throughout this book. See
+      <xref linkend="postlfs-config-profile"/> for more information.</para>
+    </note>
+
     <para>If you've decided to use an alternate prefix, be sure to add
     <filename class="directory">
-    <replaceable>&lt;PREFIX&gt;</replaceable>/bin</filename> to your
+    $XORG_PREFIX/bin</filename> to your
     <envar>PATH</envar> environment variable and  <filename class="directory">
-    <replaceable>&lt;PREFIX&gt;</replaceable>/lib/pkgconfig</filename>
+    $XORG_PREFIX/lib/pkgconfig</filename>
     to your <envar>PKG_CONFIG_PATH</envar> variable.  For detailed instructions,
     see <xref linkend="postlfs-config-profile"/>.  You should also add
     <filename class="directory">
-    <replaceable>&lt;PREFIX&gt;</replaceable>/lib</filename> to the
+    $XORG_PREFIX/lib</filename> to the
     <filename>/etc/ld.so.conf</filename> file and <filename class="directory">
-    <replaceable>&lt;PREFIX&gt;</replaceable>/share/man</filename> as
+    $XORG_PREFIX/share/man</filename> as
     a MANDATORY_MANPATH in <filename>/etc/man_db.conf</filename>.</para>
 
Index: x/lib/lesstif.xml
===================================================================
--- x/lib/lesstif.xml	(revision d603c3da67d8d7badbec744872b8bfb03ca9b807)
+++ x/lib/lesstif.xml	(revision f67fa9df49a1a0d75e526809ee0b2060a090d0a9)
@@ -90,7 +90,9 @@
 patch -Np1 -i ../lesstif-&lesstif-version;-testsuite_fix-1.patch &amp;&amp;
 ./configure --prefix=/usr \
+            --sysconfdir=/etc/X11 \
             --disable-debug \
             --enable-production \
             --with-xdnd &amp;&amp;
+sed -i "s@libdir)/X11/mwm@sysconfdir)/mwm@" clients/Motif-2.1/mwm/Makefile &amp;&amp;
 make rootdir=/usr/share/doc/lesstif-&lesstif-version;</userinput></screen>
 
@@ -104,10 +106,11 @@
 ldconfig</userinput></screen>
 
-    <para>You will need to change the <application>X</application> prefix in
-    the commands below if your X Window System is installed anywhere other than
-    <filename class='directory'>/usr/X11R6</filename>.</para>
-
-<screen role="root"><userinput>mv -v <replaceable>&lt;/usr/X11R6&gt;</replaceable>/lib/X11/mwm /etc/X11 &amp;&amp;
-ln -v -s /etc/X11/mwm <replaceable>&lt;/usr/X11R6&gt;</replaceable>/lib/X11</userinput></screen>
+    <para>Applicatons that utilize Xorg libraries often, and incorrectly,
+    expect to find configuration files in 
+    <filename class="directory">$XORG_PREFIX/lib/X11</filename>.  While still
+    the <systemitem class="username">root</systemitem> user, create a
+    compatibility symlink with the following command:</para>
+
+<screen role="root"><userinput>ln -v -sf /etc/X11/mwm $XORG_PREFIX/lib/X11</userinput></screen>
 
   </sect2>
@@ -135,10 +138,7 @@
     directory.</para>
 
-    <para><command>mv -v <replaceable>&lt;/usr/X11R6&gt;</replaceable>/lib/X11/mwm
-    /etc/X11</command>:
-    The FHS requires that configuration files exist only in the
-    <filename class="directory">/etc/X11</filename> directory.  The
-    configuration directory (<filename class="directory">mwm</filename>)
-    is moved, and a symlink is created at the original location.</para>
+    <para><command>sed -i "s@libdir)/X11/mwm@sysconfdir)/mwm@" 
+    clients/Motif-2.1/mwm/Makefile</command>: This corrects the installation
+    prefix for the mwm directory for FHS compliance.</para>
 
   </sect2>
Index: x/lib/libxklavier.xml
===================================================================
--- x/lib/libxklavier.xml	(revision d603c3da67d8d7badbec744872b8bfb03ca9b807)
+++ x/lib/libxklavier.xml	(revision f67fa9df49a1a0d75e526809ee0b2060a090d0a9)
@@ -90,8 +90,6 @@
     <title>Command Explanations</title>
 
-    <para><option>--with-xkb-base=<replaceable>&lt;$X_PREFIX&gt;</replaceable>/share/X11/xkb</option>:
-    Use this parameter (substitute properly for the
-    <replaceable>&lt;$X_PREFIX&gt;</replaceable>) if the
-    <replaceable>&lt;$X_PREFIX&gt;</replaceable> is anything other than
+    <para><option>--with-xkb-base=$XORG_PREFIX/share/X11/xkb</option>:
+    Use this parameter if the $XORG_PREFIX is anything other than
     <filename class='directory'>/usr</filename>.</para>
 
