diff --git a/en_US.ISO8859-1/books/handbook/Makefile b/en_US.ISO8859-1/books/handbook/Makefile
index 571f8abee7..7dd45b60de 100644
--- a/en_US.ISO8859-1/books/handbook/Makefile
+++ b/en_US.ISO8859-1/books/handbook/Makefile
@@ -67,6 +67,7 @@ IMAGES_EN+= bsdinstall/bsdinstall-final-modification-shell.png
 IMAGES_EN+= bsdinstall/bsdinstall-keymap-10.png
 IMAGES_EN+= bsdinstall/bsdinstall-keymap-loading.png
 IMAGES_EN+= bsdinstall/bsdinstall-keymap-select-default.png
+IMAGES_EN+= bsdinstall/bsdinstall-keymap-testing.png
 IMAGES_EN+= bsdinstall/bsdinstall-mainexit.png
 IMAGES_EN+= bsdinstall/bsdinstall-netinstall-files.png
 IMAGES_EN+= bsdinstall/bsdinstall-netinstall-mirrorselect.png
diff --git a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
index b750349c1a..b0d3eb8fb7 100644
--- a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
@@ -947,61 +947,14 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 	</mediaobject>
       </figure>
 
-      <para>Depending on the system console being used,
-	<application>bsdinstall</application> may initially display
-	the menu shown in <xref
-	  linkend="bsdinstall-keymap-select-default"/>.</para>
-
-      <figure xml:id="bsdinstall-keymap-select-default">
-	<title>Keymap Selection</title>
-
-	<mediaobject>
-	  <imageobject>
-	    <imagedata
-	      fileref="bsdinstall/bsdinstall-keymap-select-default"/>
-	  </imageobject>
-	</mediaobject>
-      </figure>
-
-      <para>To configure the keyboard layout, press
-	<keycap>Enter</keycap> with
-	<guibutton>[&nbsp;YES&nbsp;]</guibutton> selected, which will
-	display the menu shown in <xref
-	  linkend="bsdinstall-config-keymap"/>.  To instead use the
-	default layout, use the arrow key to select
-	<guibutton>[&nbsp;NO&nbsp;]</guibutton> and press
-	<keycap>Enter</keycap> to skip this menu screen.</para>
-
-      <figure xml:id="bsdinstall-config-keymap">
-	<title>Selecting Keyboard Menu</title>
-
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-config-keymap"/>
-	  </imageobject>
-	</mediaobject>
-      </figure>
-
-      <para>When configuring the keyboard layout, use the up and down
-	arrows to select the keymap that most closely represents the
-	mapping of the keyboard attached to the system.  Press
-	<keycap>Enter</keycap> to save the selection.</para>
-
-      <note>
-	<para>Pressing <keycap>Esc</keycap> will exit this menu and
-	  use the default keymap.  If the choice of keymap is not
-	  clear, <guimenuitem>United States of America
-	    ISO-8859-1</guimenuitem> is also a safe option.</para>
-      </note>
-
-      <para>In &os; 10.0-RELEASE and later, this menu has been
-	enhanced.  The full selection of keymaps is shown, with the
-	default preselected.  In addition, when selecting a different
-	keymap, a dialog is displayed that allows the user to try the
-	keymap and ensure it is correct before proceeding.</para>
+      <para>After the keymaps have been loaded bsdinstall displays the
+	menu shown in <xref linkend="bsdinstall-keymap-10"/>.  Use the
+	up and down arrows to select the keymap that most closely
+	represents the mapping of the keyboard attached to the system.
+	Press <keycap>Enter</keycap> to save the selection.</para>
 
       <figure xml:id="bsdinstall-keymap-10">
-	<title>Enhanced Keymap Menu</title>
+	<title>Keymap Selection Menu</title>
 
 	<mediaobject>
 	  <imageobject>
@@ -1010,6 +963,26 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 	</mediaobject>
       </figure>
 
+      <note><para>Pressing <keycap>Esc</keycap> will exit this menu
+	and use the default keymap.  If the choice of keymap is not
+	clear, <guimenuitem>United States of America
+	ISO-8859-1</guimenuitem> is also a safe option.</para></note>
+
+      <para>In addition, when selecting a different keymap, the user
+	can try the keymap and ensure it is correct before proceeding
+	as shown in <xref linkend="bsdinstall-keymap-testing"/>.</para>
+
+      <figure xml:id="bsdinstall-keymap-testing">
+	<title>Keymap Testing Menu</title>
+
+	<mediaobject>
+	  <imageobject>
+	    <imagedata
+	      fileref="bsdinstall/bsdinstall-keymap-testing"/>
+	  </imageobject>
+	</mediaobject>
+      </figure>
+
     </sect2>
 
     <sect2 xml:id="bsdinstall-hostname">
diff --git a/share/images/books/handbook/bsdinstall/bsdinstall-keymap-testing.png b/share/images/books/handbook/bsdinstall/bsdinstall-keymap-testing.png
new file mode 100644
index 0000000000..69cb77e1b2
Binary files /dev/null and b/share/images/books/handbook/bsdinstall/bsdinstall-keymap-testing.png differ