diff --git a/en_US.ISO8859-1/books/handbook/install/chapter.sgml b/en_US.ISO8859-1/books/handbook/install/chapter.sgml
index 2053a0b3fc..62928e9117 100644
--- a/en_US.ISO8859-1/books/handbook/install/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/install/chapter.sgml
@@ -2609,20 +2609,20 @@ Mounting root from ufs:/dev/md0c
 
       <para>If a graphical user interface is desired then a distribution
 	set that is preceded by an <literal>X</literal> should be
-	chosen.  The configuration of XFree86 and selection of a default
+	chosen.  The configuration of <application>XFree86</application> and selection of a default
 	desktop is part of the post-installation steps.</para>
 
-      <para>The default version of XFree86 that is installed depends on the
+      <para>The default version of <application>XFree86</application> that is installed depends on the
 	version of the FreeBSD that you are installing.  For FreeBSD versions
-	prior to 4.6, XFree86 3.x is installed.  For FreeBSD 4.6 and later,
-	XFree86 4.x is the default.</para>
+	prior to 4.6, <application>XFree86 3.X</application> is installed.  For FreeBSD 4.6 and later,
+	<application>XFree86 4.X</application> is the default.</para>
 
       <para>You should check to see whether your video card is supported at the
 	<ulink url="http://www.xfree86.org/">XFree86</ulink> web site.  If it
 	is not supported under the default version that FreeBSD will install,
 	you should select a distribution without X for installation.  After
 	installation, install and configure the appropriate version of 
-	XFree86 using the ports collection.</para>
+	<application>XFree86</application> using the ports collection.</para>
 
       <para>If compiling a custom kernel is anticipated, select an option
 	which includes the source code.  For more information on why a
@@ -3777,7 +3777,7 @@ To change any of these settings later, edit /etc/rc.conf
 	or others, the X server will need to be configured.</para>
 
       <note>
-	<para>In order to run XFree86 as a non <username>root</username> user you will need to
+	<para>In order to run <application>XFree86</application> as a non <username>root</username> user you will need to
 	  install <filename role="package">x11/wrapper</filename>.  This can be added
 	  from the Package Selection menu.</para>
       </note>
@@ -4261,15 +4261,15 @@ failed.  Would you like to try again?
 
              [ Yes ]         No</screen>
 
-      <para>If you have trouble configuring XFree86, select
+      <para>If you have trouble configuring <application>XFree86</application>, select
 	<guimenuitem>[ No ]</guimenuitem> and press <keycap>Enter</keycap>
 	and continue with the installation process.  After installation
 	you can use <command>xf86cfg -textmode</command> or
 	<command>xf86config</command> to access the command line
 	configuration utilities as <username>root</username>.  There is
-	an additional method for configuring XFree86 described in
+	an additional method for configuring <application>XFree86</application> described in
 	<xref linkend="x11">.   If you choose not to configure
-	XFree86 at this time the next menu will be for package
+	<application>XFree86</application> at this time the next menu will be for package
 	selection.</para>
 
       <para>The default setting which allows the server to be killed
@@ -4292,7 +4292,7 @@ failed.  Would you like to try again?
 
       <para>After installation, the display can be adjusted for height,
 	width, or centering by using <application>xvidtune</application>
-	after you have XFree86 running with
+	after you have <application>XFree86</application> running with
 	<application>xvidtune</application>.</para>
 
       <para>There are warnings that improper settings can
@@ -4304,7 +4304,7 @@ failed.  Would you like to try again?
       <para>Read the &man.xvidtune.1; manual page before making
 	any adjustments.</para>
 
-      <para>Following a successful XFree86 configuration, it will proceed
+      <para>Following a successful <application>XFree86</application> configuration, it will proceed
 	to the selection of a default desktop.</para>
     </sect2>
 
@@ -4378,7 +4378,7 @@ failed.  Would you like to try again?
 
       <note>
 	<para>This is a good time to install
-	  <application>wrapper</application> in order to run XFree86
+	  <application>wrapper</application> in order to run <application>XFree86</application>
 	  as a user.</para>
       </note>