Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision f49e0c77dd7a9d62e0b7f924eab96d1b6ab4879c)
+++ introduction/welcome/changelog.xml	(revision 531e09ed379bf5a1226c48cd44e03b91a71fd335)
@@ -55,6 +55,6 @@
         </listitem>
         <listitem>
-          <para>[dj] - Corrected MesaLib instructions to account for 
-          X11R6.</para>
+          <para>[dj] - Added note to not build MesaLib with X11R6 and
+          removed Xfree and xorg-6.9 from required deps.</para>
         </listitem>
         <listitem>
Index: x/lib/mesalib.xml
===================================================================
--- x/lib/mesalib.xml	(revision f49e0c77dd7a9d62e0b7f924eab96d1b6ab4879c)
+++ x/lib/mesalib.xml	(revision 531e09ed379bf5a1226c48cd44e03b91a71fd335)
@@ -65,10 +65,14 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para>
-<!--<xref linkend="x-window-system"/> -->
-    <xref linkend="xorg"/> or
-    <xref linkend="xorg7-lib"/> and <xref linkend="xorg7-util"/>, 
+    <para><xref linkend="xorg7-lib"/>, 
+    <xref linkend="xorg7-util"/>, 
     <xref linkend="libdrm"/>, and
     <xref linkend="pkgconfig"/></para>
+
+    <note>
+      <para>It is not recomended to build a newer version of 
+      <application>Mesa</application> with <xref linkend="xfree86"/> or
+      <xref linkend="xorg"/>.</para>
+    </note>
 
     <bridgehead renderas="sect3">Recommended Download</bridgehead>
@@ -101,14 +105,8 @@
     installation prefix of the X Window System.  First, correct several 
     hard coded directories in the source files with the following 
-    command (you can skip this first command if the prefix is 
-   <filename class="directory">/usr/X11R6</filename>):</para>
-
-<screen><userinput>find . -type f -exec sed -i 's@/usr/X11R6@<replaceable>&lt;PREFIX&gt;</replaceable>@g' {} \;</userinput></screen>
-
-    <para>If building for <application>Xorg-&xorg7-version;</application>,
-    issue the following command to correct for the default module path in the
-    new build system:</para>
-
-<screen><userinput>sed -i 's@lib/modules@lib/X11/modules@' src/glx/x11/dri_glx.c</userinput></screen>
+    commands:</para>
+
+<screen><userinput>find . -type f -exec sed -i 's@/usr/X11R6@<replaceable>&lt;PREFIX&gt;</replaceable>@g' {} \; &amp;&amp;
+sed -i 's@lib/modules@lib/X11/modules@' src/glx/x11/dri_glx.c</userinput></screen>
 
     <para>Build <application>MesaLib</application>
@@ -120,8 +118,6 @@
 
     <para>Now, as the <systemitem class="username">root</systemitem> user,
-    issue the following commands to install <application>MesaLib</application>. 
-    Again you should adjust the commands if you've installed the X Window 
-    System into any prefix other than 
-    <filename class="directory">/usr</filename>:</para>
+    issue the following commands to install 
+    <application>MesaLib</application>:</para>
 
 <screen role="root"><userinput>bin/installmesa <replaceable>&lt;PREFIX&gt;</replaceable></userinput></screen>
@@ -132,10 +128,4 @@
 <screen role="root"><userinput>mkdir -v -p <replaceable>&lt;PREFIX&gt;</replaceable>/lib/X11/modules/dri &amp;&amp;
 install -v -m755 lib/*dri* <replaceable>&lt;PREFIX&gt;</replaceable>/lib/X11/modules/dri</userinput></screen>
-
-    <para>For Xorg-&xorg-version; <!-- or XFree86-&xfree86-version; -->, use 
-    these commands instead:</para>
-
-<screen role="root"><userinput>mkdir -v -p <replaceable>&lt;PREFIX&gt;</replaceable>/lib/modules/dri &amp;&amp;
-install -v -m755 lib/*dri* <replaceable>&lt;PREFIX&gt;</replaceable>/lib/modules/dri</userinput></screen>
 
     <para>If you've extracted the Demos package as well, then
@@ -147,13 +137,11 @@
 
     <para>Install the demos as the
-    <systemitem class="username">root</systemitem> user, again adjusting for 
-    the prefix of your X Window System:</para>
+    <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>install -v -m755 glxinfo glxgears <replaceable>&lt;PREFIX&gt;</replaceable>/bin</userinput></screen>
 
     <note>
-      <para>If building <xref linkend="xorg7"/>, do not
-      remove the Mesa source tree yet, it will be required to build the
-      X server.</para>
+      <para>Do not remove the Mesa source tree yet, it will be required to 
+      build the <xref linkend="xorg7-server"/>.</para>
     </note>
 
