Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision cee59ff185493afb706e09840a2561defae479d2)
+++ introduction/welcome/changelog.xml	(revision 18bcaf6c8fd3ee7250e31032c050065d52eaabfc)
@@ -46,4 +46,9 @@
       <itemizedlist>
         <listitem>
+          <para>[dnicholson] - Added commands to make only TrueType fonts
+          available to Fontconfig in Xorg-6.9.0, Xorg-7.0.0 and XFree86-4.5.0.
+          Fixed name of luit patch in Xorg-6.9.0.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Updated to Firefox-1.5.0.1.</para>
         </listitem>
Index: x/installing/xfree86.xml
===================================================================
--- x/installing/xfree86.xml	(revision cee59ff185493afb706e09840a2561defae479d2)
+++ x/installing/xfree86.xml	(revision 18bcaf6c8fd3ee7250e31032c050065d52eaabfc)
@@ -93,4 +93,7 @@
       instruct <application>XFree86</application> to build them.</para>
     </note>
+
+    <bridgehead renderas="sect3" condition="html" role="usernotes">User Notes:
+    <ulink url='&blfs-wiki;/XFree86-&xfree86-version;'/></bridgehead>
 
     <bridgehead renderas="sect3">Download Instructions</bridgehead>
@@ -383,4 +386,16 @@
 ln -v -sf ../X11R6/include/X11 /usr/include/X11</userinput></screen>
 
+      <para>The <application>XFree86</application> fonts have been installed
+      outside of <application>Fontconfig</application>'s default search path
+      of <filename class="directory">/usr/share/fonts</filename>.  In order
+      for <application>Fontconfig</application> to find the installed TrueType
+      fonts, you should make symlinks to their directories.  Assuming you've
+      installed <application>XFree86</application> in the default prefix, run the
+      following commands as the <systemitem class="username">root</systemitem>
+      user:</para>
+
+<screen role="root"><userinput>ln -svn /usr/X11R6/lib/X11/fonts/OTF /usr/share/fonts/X11-OTF &amp;&amp;
+ln -svn /usr/X11R6/lib/X11/fonts/TTF /usr/share/fonts/X11-TTF</userinput></screen>
+
       <para><application>XFree86</application> installs the
       <application>XRender</application> and
Index: x/installing/xorg.xml
===================================================================
--- x/installing/xorg.xml	(revision cee59ff185493afb706e09840a2561defae479d2)
+++ x/installing/xorg.xml	(revision 18bcaf6c8fd3ee7250e31032c050065d52eaabfc)
@@ -106,4 +106,7 @@
     <para role="optional"><xref linkend="linux-pam"/></para>
 
+    <bridgehead renderas="sect3" condition="html" role="usernotes">User Notes:
+    <ulink url='&blfs-wiki;/Xorg-&xorg-version;'/></bridgehead>
+
     <bridgehead renderas="sect3">Download Instructions</bridgehead>
 
@@ -204,5 +207,5 @@
       commands:</para>
 
-<screen><userinput>patch -Np1 -i ../X11R&xorg-version;-luit_race-1.patch &amp;&amp;
+<screen><userinput>patch -Np1 -i ../xorg-&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>
@@ -374,4 +377,16 @@
 ln -v -s ../X11R6/include/X11 /usr/include/X11</userinput></screen>
 
+      <para>The <application>Xorg</application> fonts have been installed
+      outside of <application>Fontconfig</application>'s default search path
+      of <filename class="directory">/usr/share/fonts</filename>.  In order
+      for <application>Fontconfig</application> to find the installed TrueType
+      fonts, you should make symlinks to their directories.  Assuming you've
+      installed <application>Xorg</application> in the default prefix, run the
+      following commands as the <systemitem class="username">root</systemitem>
+      user:</para>
+
+<screen role="root"><userinput>ln -svn /usr/X11R6/lib/X11/fonts/OTF /usr/share/fonts/X11-OTF &amp;&amp;
+ln -svn /usr/X11R6/lib/X11/fonts/TTF /usr/share/fonts/X11-TTF</userinput></screen>
+
     </sect3>
 
Index: x/installing/xorg7.xml
===================================================================
--- x/installing/xorg7.xml	(revision cee59ff185493afb706e09840a2561defae479d2)
+++ x/installing/xorg7.xml	(revision 18bcaf6c8fd3ee7250e31032c050065d52eaabfc)
@@ -50,6 +50,6 @@
     <para role="optional"><xref linkend="linux-pam"/></para>
 
-    <para condition="html" role="usernotes">User Notes:
-    <ulink role="usernotes" url='&blfs-wiki;/Xorg-7.0.0'/></para>
+    <bridgehead renderas="sect3" condition="html" role="usernotes">User Notes:
+    <ulink url='&blfs-wiki;/Xorg-&xorg7-version;'/></bridgehead>
 
     <bridgehead renderas="sect3">Xorg Download and Installation
@@ -80,5 +80,5 @@
       packages.  The instructions assume that all packages have been built
       from a particular group unless otherwise noted. A
-      <ulink url="http://wiki.linuxfromscratch.org/blfs/wiki/Xorg-7.0.0">
+      <ulink url="http://wiki.linuxfromscratch.org/blfs/wiki/Xorg-&xorg7-version;">
       wiki</ulink> page containing dependency information, for users who wish
       to cut down on the installed size of <application>Xorg</application>, is
@@ -464,4 +464,15 @@
 
 <screen><userinput role="root">make install</userinput></screen>
+
+      <para>When all of the fonts have been installed, the system must be
+      configured so that <application>Fontconfig</application> can find the
+      TrueType fonts since they are outside of the default search path of
+      <filename class="directory">/usr/share/fonts</filename>.  Make symlinks
+      to the <application>Xorg</application> TrueType font directories by
+      running the following commands as the
+      <systemitem class="username">root</systemitem> user:</para>
+
+<screen><userinput role="root">ln -svn $XORG_PREFIX/lib/X11/fonts/OTF /usr/share/fonts/X11-OTF &amp;&amp;
+ln -svn $XORG_PREFIX/lib/X11/fonts/TTF /usr/share/fonts/X11/TTF</userinput></screen>
 
       <note>
