diff --git a/en_US.ISO8859-1/books/handbook/x11/chapter.sgml b/en_US.ISO8859-1/books/handbook/x11/chapter.sgml
index b2364b4970..bc47b07055 100644
--- a/en_US.ISO8859-1/books/handbook/x11/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/x11/chapter.sgml
@@ -164,7 +164,7 @@
 
 	<para>A familiar focus policy is called <quote>click-to-focus</quote>.
 	  This is the model utilized by Microsoft Windows, in which a window
-	  becomes active upon receiving a mouse click.
+	  becomes active upon receiving a mouse click.</para>
 
 	<para>X does not support any particular focus policy.  Instead, the
 	  window manager controls which window has the focus at any one time.
@@ -265,29 +265,34 @@
       new features such as better support for fonts and
       anti-aliasing.  Unfortunately this new architecture requires 
       that the video drivers be rewritten, and some of the older
-      cards that were supported in 3.X are not yet supported in 4.X.</para>
+      cards that were supported in 3.X are not yet supported in 4.X.  As all
+      new developments and support for new graphics cards are done on that
+      branch, <application>XFree86 4.X</application> is now the default
+      version of the X Window System on FreeBSD.</para>
 
     <para>The FreeBSD setup program offers users the opportunity to install
-      and configure XFree86 3.3.6 during installation (covered in
-      <xref linkend="x-server">).  To run
-      <application>XFree86 4.X</application>, wait until after the base
+      and configure XFree86 4.X during installation (covered in
+      <xref linkend="x-server">).  To install and run
+      <application>XFree86 3.X</application>, wait until after the base
       FreeBSD system is installed, and then install XFree86.  For example,
-      to build and install <application>XFree86 4.X</application> from the
+      to build and install <application>XFree86 3.X</application> from the
       ports collection:</para>
 
-    <screen>&prompt.root; <userinput>cd /usr/ports/x11/XFree86-4</userinput>
+    <screen>&prompt.root; <userinput>cd /usr/ports/x11/XFree86</userinput>
 &prompt.root; <userinput>make all install clean</userinput></screen>
 
-    <para>Alternatively, <application>XFree86 4.X</application> can be
-      installed from a binary package with the
-      <command>pkg_add</command> tool or directly from the FreeBSD
+    <para>Alternatively, either version of <application>XFree86</application> can be
+      installed
+      directly from the FreeBSD
       binaries provided on the <ulink
-      url="http://www.XFree86.org/">XFree86 web site</ulink>.</para>
+      url="http://www.XFree86.org/">XFree86 web site</ulink>.  A binary
+      package to use with &man.pkg.add.1; tool is also available for
+      <application>XFree86 4.X</application>.</para>
     
     <para>The rest of this chapter will explain how to configure
       XFree86, and how to setup a productive desktop environment.</para>
 
-<!-- Easiest way is from sysinstall for XFree86 3.X -->
+<!-- Easiest way is from sysinstall for XFree86 4.X -->
 
   </sect1>