Index: x/installing/xorg.xml
===================================================================
--- x/installing/xorg.xml	(revision 9879f11d754dc5b92dfa5626859e7e39aaee6c68)
+++ x/installing/xorg.xml	(revision 3e7ee209b96926d19e0d4a2ea9a9dc82c05b17f5)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY xorg-download-http " ">
-  <!ENTITY xorg-download-ftp  "ftp://ftp.opengroup.org/pub/x.org/pub/X11R&xorg-version;/src-single/X11R&xorg-version;-src.tar.bz2">
-  <!ENTITY xorg-md5sum        "8131cd7ea1e4566e6e05c438a93fcfe1">
-  <!ENTITY xorg-size          "43 MB">
-  <!ENTITY xorg-buildsize     "839 MB">
-  <!ENTITY xorg-time          "10.34 SBU">
+  <!ENTITY xorg-download-http "http://xorg.freedesktop.org/releases/X11R&xorg-version;/src-single/X11R&xorg-version;-src.tar.bz2 ">
+  <!ENTITY xorg-download-ftp  "ftp://expo.x.org/pub/X11R&xorg-version;/src-single/X11R&xorg-version;-src.tar.bz2">
+  <!ENTITY xorg-md5sum        "52ad69832db5c36c7041f90625ed4598">
+  <!ENTITY xorg-size          "45 MB">
+  <!ENTITY xorg-buildsize     "864 MB">
+  <!ENTITY xorg-time          "11.68 SBU">
 ]>
 
@@ -35,13 +35,15 @@
 
     <note>
-      <para>There are two packages in BLFS that implement the <application>X
-      Window System</application>: <application>Xorg</application> and
-      <application>XFree86</application>. These packages are quite similar.
-      In fact, the base system of <application>Xorg</application> is
-      <application>XFree86</application>-4.4.0RC2. The primary difference as
-      of this writing is the license provisions of the packages. For someone
-      building a package for their own use, these issues are not significant.
+      <para>There are three packages in BLFS that implement the <application>X
+      Window System</application>: <application>Xorg</application> 
+      (X11R6 and X11R7) and  <application>XFree86</application>. These 
+      packages are all quite similar.  In fact, the base system of 
+      <application>Xorg</application> is 
+      <application>XFree86</application>-4.4.0RC2. Licensing was the original
+      reason for the split.  <application>Xorg-&xorg7-version;</application>
+      introduces a completely autotooled build system, but is otherwise the
+      same codebase as <application>Xorg-&xorg-version;</application>. 
       Most large commercial distributions have decided to use the
-      <application>Xorg</application> package, but several still use
+      <application>Xorg</application> package, but several still provide
       <application>XFree86</application>.</para>
 
@@ -50,19 +52,15 @@
       unhappy with the administration and progress of
       <application>XFree86</application>. X.org's future plans include
-      significant improvements to the internals of the system and more frequent
-      releases.</para>
+      significant improvements to the internals of the system and more 
+      frequent releases.</para>
 
       <para><application>XFree86</application> continues to be a solid,
       conservative application with excellent driver support.</para>
 
-      <para>Both <application>Xorg</application> and
-      <application>XFree86</application> can be installed in the same way,
-      but this section will provide a slightly different and more current
-      variation for installation.</para>
     </note>
 
     <para><application>Xorg</application> is a freely redistributable open-source
     implementation of the <application>X</application> Window System. This
-    application provides a client/server interface between display hardware (the
+    system provides a client/server interface between display hardware (the
     mouse, keyboard, and video displays) and the desktop environment, while also
     providing both the windowing infrastructure and a standardized application
@@ -95,5 +93,5 @@
       <listitem>
         <para>Required patch: <ulink
-        url="&patch-root;/X11R&xorg-version;-src-gcc4-1.patch"/></para>
+        url="&patch-root;/X11R&xorg-version;-luit_race-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -111,6 +109,6 @@
 
     <para>As an alternative to downloading the entire source tree in a single
-    file, there are several files that need to be fetched from the download
-    location (directory /pub/x.org/pub/X11R&xorg-version;/src/):</para>
+    file, there are several, smaller files that can be fetched from the 
+    download location (directory /pub/X11R&xorg-version;/src/):</para>
 
     <itemizedlist spacing='compact'>
@@ -197,11 +195,24 @@
 
     <sect3>
-      <title>Patching to be Compatible with GCC-4.x</title>
+      <title>Various build fixes</title>
 
       <para>The <application>Xorg</application> sources must be patched in
-      order to be compiled using <application>GCC</application>-4.x. Install
-      the following patch:</para>
-
-<screen><userinput>patch -Np1 -i ../X11R&xorg-version;-src-gcc4-1.patch</userinput></screen>
+      order to avoid a race condition with the <application>luit</application>
+      program.  Additionally, recent <application>glibc</application> requires
+      <filename>linux/types.h</filename> to be included prior to 
+      <filename>asm/types.h</filename>.  Fix both issues with the following 
+      commands:</para>
+
+<screen><userinput>patch -Np1 -i ../X11R&xorg-version;-luit_race-1.patch &amp;&amp;
+sed -i "s@*/@*/\n#include &lt;linux/types.h&gt;\n@" \
+    programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c</userinput></screen>
+
+      <para>Additionally, if you choose to install 
+      <application>Xorg</application> to any prefix other than 
+      <filename class="directory">/usr/X11R6</filename>, the luit package
+      needs another correction to fix a hard coded path.  Execute the 
+      following command:</para>
+
+<screen><userinput>sed -i 's@/usr/X11R6@<replaceable>[/usr]</replaceable>@' programs/luit/parser.h</userinput></screen>
 
     </sect3>
@@ -318,4 +329,7 @@
 #define XInputDrivers           mouse keyboard
 
+/* Xterm is no longer built by default */
+#define BuildXterm              YES
+
 /* Disable building Xprint server and clients until we get them figured
  * out but build Xprint libraries to allow precompiled binaries such as
