diff --git a/en_US.ISO8859-1/books/handbook/x11/chapter.xml b/en_US.ISO8859-1/books/handbook/x11/chapter.xml
index df53fd23c8..88ef1b53d4 100644
--- a/en_US.ISO8859-1/books/handbook/x11/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/x11/chapter.xml
@@ -577,12 +577,12 @@ dbus_enable="YES"</programlisting>
 	to the X server configuration file
 	(<filename>/etc/X11/xorg.conf</filename>), which reads:</para>
 
-      <programlisting>FontPath "/usr/local/lib/X11/fonts/urwfonts/"</programlisting>
+      <programlisting>FontPath "/usr/local/share/fonts/urwfonts/"</programlisting>
 
       <para>Alternatively, at the command line in the X session
 	run:</para>
 
-      <screen>&prompt.user; <userinput>xset fp+ /usr/local/lib/X11/fonts/urwfonts</userinput>
+      <screen>&prompt.user; <userinput>xset fp+ /usr/local/share/fonts/urwfonts</userinput>
 &prompt.user; <userinput>xset fp rehash</userinput></screen>
 
       <para>This will work but will be lost when the X session is
@@ -619,7 +619,7 @@ dbus_enable="YES"</programlisting>
 
       <para>Now make a directory for the &truetype; fonts (for
 	example,
-	<filename>/usr/local/lib/X11/fonts/TrueType</filename>) and
+	<filename>/usr/local/share/fonts/TrueType</filename>) and
 	copy all of the &truetype; fonts into this directory.  Keep in
 	mind that &truetype; fonts cannot be directly taken from an
 	&apple; &mac;; they must be in &unix;/&ms-dos;/&windows;
@@ -632,14 +632,14 @@ dbus_enable="YES"</programlisting>
 	Ports Collection as
 	<package>x11-fonts/ttmkfdir</package>.</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/local/lib/X11/fonts/TrueType</userinput>
+      <screen>&prompt.root; <userinput>cd /usr/local/share/fonts/TrueType</userinput>
 &prompt.root; <userinput>ttmkfdir -o fonts.dir</userinput></screen>
 
       <para>Now add the &truetype; directory to the font path.  This
 	is just the same as described in <xref
 	  linkend="type1"/>:</para>
 
-      <screen>&prompt.user; <userinput>xset fp+ /usr/local/lib/X11/fonts/TrueType</userinput>
+      <screen>&prompt.user; <userinput>xset fp+ /usr/local/share/fonts/TrueType</userinput>
 &prompt.user; <userinput>xset fp rehash</userinput></screen>
 
       <para>or add a <literal>FontPath</literal> line to
@@ -677,7 +677,7 @@ dbus_enable="YES"</programlisting>
       </indexterm>
 
       <para>All fonts in <application>&xorg;</application> that are
-	found in <filename>/usr/local/lib/X11/fonts/</filename> and
+	found in <filename>/usr/local/share/fonts/</filename> and
 	<filename>~/.fonts/</filename> are automatically made
 	available for anti-aliasing to Xft-aware applications.  Most
 	recent applications are Xft-aware, including
@@ -707,7 +707,7 @@ dbus_enable="YES"</programlisting>
       &lt;fontconfig&gt;</programlisting>
 
       <para>As previously stated, all fonts in
-	<filename>/usr/local/lib/X11/fonts/</filename> as well as
+	<filename>/usr/local/share/fonts/</filename> as well as
 	<filename>~/.fonts/</filename> are already made available to
 	Xft-aware applications.  If you wish to add another directory
 	outside of these two directory trees, add a line similar to