diff --git a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
index b0d3eb8fb7..c6ced8814e 100644
--- a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
@@ -1034,19 +1034,21 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 
       <itemizedlist>
 	<listitem>
-	  <para><literal>doc</literal> - Additional documentation,
-	    mostly of historical interest, to install into
-	    <filename>/usr/share/doc</filename>.  The documentation
-	    provided by the FreeBSD Documentation Project may be
-	    installed later using the instructions in <xref
-	      linkend="updating-upgrading-documentation"/>.</para>
+	  <para><literal>base-dbg</literal> - Base tools like
+	    <application>cat</application>,
+	    <application>ls</application> among many others with
+	    debug symbols activated.</para>
 	</listitem>
 
 	<listitem>
-	  <para><literal>games</literal> - Several traditional
-	    <acronym>BSD</acronym> games, including
-	    <application>fortune</application>,
-	    <application>rot13</application>, and others.</para>
+	  <para><literal>kernel-dbg</literal> - Kernel and modules with
+	    debug symbols activated.</para>
+	</listitem>
+
+	<listitem>
+	  <para><literal>lib32-dbg</literal> - Compatibility libraries
+	    for running 32-bit applications on a 64-bit version of
+	    &os; with debug symbols activated.</para>
 	</listitem>
 
 	<listitem>
@@ -1081,6 +1083,10 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 	    1&nbsp;GB of disk space and recompiling the entire &os;
 	    system requires an additional 5&nbsp;GB of space.</para>
 	</listitem>
+
+	<listitem>
+	  <para><literal>tests</literal> - &os; Test Suite.</para>
+	</listitem>
       </itemizedlist>
     </sect2>
 
diff --git a/share/images/books/handbook/bsdinstall/bsdinstall-config-components.png b/share/images/books/handbook/bsdinstall/bsdinstall-config-components.png
index 06c6ffda72..2c07b69390 100644
Binary files a/share/images/books/handbook/bsdinstall/bsdinstall-config-components.png and b/share/images/books/handbook/bsdinstall/bsdinstall-config-components.png differ