Index: en_US.ISO8859-1/books/handbook/Makefile
===================================================================
--- en_US.ISO8859-1/books/handbook/Makefile
+++ en_US.ISO8859-1/books/handbook/Makefile
@@ -67,6 +67,7 @@
 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
Index: en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
===================================================================
--- en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
+++ en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
@@ -947,65 +947,38 @@
        </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>
+      <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-select-default">
-       <title>Keymap Selection</title>
+      <figure xml:id="bsdinstall-keymap-10">
+       <title>Keymap Selection Menu</title>
 
        <mediaobject>
          <imageobject>
-           <imagedata
-             fileref="bsdinstall/bsdinstall-keymap-select-default"/>
+           <imagedata fileref="bsdinstall/bsdinstall-keymap-10"/>
          </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>
+      <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>
 
-      <figure xml:id="bsdinstall-config-keymap">
-       <title>Selecting Keyboard Menu</title>
+      <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>
 
-       <mediaobject>
-         <imageobject>
-           <imagedata fileref="bsdinstall/bsdinstall-config-keymap"/>
-         </imageobject>
-       </mediaobject>
-      </figure>
+      <figure xml:id="bsdinstall-keymap-testing">
+       <title>Keymap Testing Menu</title>
 
-      <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>
-
-      <figure xml:id="bsdinstall-keymap-10">
-       <title>Enhanced Keymap Menu</title>
-
        <mediaobject>
          <imageobject>
-           <imagedata fileref="bsdinstall/bsdinstall-keymap-10"/>
+           <imagedata
+             fileref="bsdinstall/bsdinstall-keymap-testing"/>
          </imageobject>
        </mediaobject>
       </figure>