diff --git a/en_US.ISO8859-1/books/handbook/Makefile b/en_US.ISO8859-1/books/handbook/Makefile
index 7dd45b60de..ad1490eb18 100644
--- a/en_US.ISO8859-1/books/handbook/Makefile
+++ b/en_US.ISO8859-1/books/handbook/Makefile
@@ -84,6 +84,8 @@ IMAGES_EN+= bsdinstall/bsdinstall-timezone-confirm.png
 IMAGES_EN+= bsdinstall/bsdinstall-timezone-country.png
 IMAGES_EN+= bsdinstall/bsdinstall-timezone-region.png
 IMAGES_EN+= bsdinstall/bsdinstall-timezone-zone.png
+IMAGES_EN+= bsdinstall/bsdinstall-timezone-date.png
+IMAGES_EN+= bsdinstall/bsdinstall-timezone-time.png
 IMAGES_EN+= bsdinstall/bsdinstall-zfs-disk_info.png
 IMAGES_EN+= bsdinstall/bsdinstall-zfs-disk_select.png
 IMAGES_EN+= bsdinstall/bsdinstall-zfs-geli_password.png
diff --git a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
index c921c6d4c8..798f4931fa 100644
--- a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
@@ -2165,22 +2165,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
     <sect2 xml:id="bsdinstall-timezone">
       <title>Setting the Time Zone</title>
 
-      <para>The next menu asks if the system clock uses
-	<acronym>UTC</acronym> or local time.  When in doubt, select
-	<guibutton>[&nbsp;No&nbsp;]</guibutton> to choose the more
-	commonly-used local time.</para>
-
-      <figure xml:id="bsdinstall-local-utc">
-	<title>Select Local or UTC Clock</title>
-
-	<mediaobject>
-	  <imageobject>
-	    <imagedata
-	      fileref="bsdinstall/bsdinstall-set-clock-local-utc"/>
-	  </imageobject>
-	</mediaobject>
-      </figure>
-
       <para>The next series of menus are used to determine the correct
 	local time by selecting the geographic region, country, and
 	time zone.  Setting the time zone allows the system to
@@ -2189,7 +2173,7 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 	functions properly.</para>
 
       <para>The example shown here is for a machine located in the
-	Eastern time zone of the United States.  The selections will
+	mainland time zone of Spain, Europe.  The selections will
 	vary according to the geographical location.</para>
 
       <figure xml:id="bsdinstall-timezone-region">
@@ -2244,9 +2228,42 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 	</mediaobject>
       </figure>
 
-      <para>Confirm the abbreviation for the time zone is correct.  If
-	it is, press <keycap>Enter</keycap> to continue with the
-	post-installation configuration.</para>
+      <para>Confirm the abbreviation for the time zone is
+	correct.</para>
+
+      <figure xml:id="bsdinstall-timezone-date">
+	<title>Select Date</title>
+
+	<mediaobject>
+	  <imageobject>
+	    <imagedata
+	      fileref="bsdinstall/bsdinstall-timezone-date"/>
+	  </imageobject>
+	</mediaobject>
+      </figure>
+
+      <para>The appropriate date is selected using the arrow keys
+	and then pressing
+	<guibutton>[&nbsp;Set&nbsp;Date&nbsp;]</guibutton>.  Otherwise,
+	the date selection can be skipped pressing
+	<guibutton>[&nbsp;Skip&nbsp;]</guibutton>.</para>
+
+      <figure xml:id="bsdinstall-timezone-time">
+	<title>Select Time</title>
+
+	<mediaobject>
+	  <imageobject>
+	    <imagedata
+	      fileref="bsdinstall/bsdinstall-timezone-time"/>
+	  </imageobject>
+	</mediaobject>
+      </figure>
+
+      <para>The appropriate time is selected using the arrow keys
+	and then pressing
+	<guibutton>[&nbsp;Set&nbsp;Time&nbsp;]</guibutton>.  Otherwise,
+	the time selection can be skipped pressing
+	<guibutton>[&nbsp;Skip&nbsp;]</guibutton>.</para>
     </sect2>
 
     <sect2 xml:id="bsdinstall-sysconf">
diff --git a/share/images/books/handbook/bsdinstall/bsdinstall-timezone-confirm.png b/share/images/books/handbook/bsdinstall/bsdinstall-timezone-confirm.png
index 3aa470d23d..254aba69d3 100644
Binary files a/share/images/books/handbook/bsdinstall/bsdinstall-timezone-confirm.png and b/share/images/books/handbook/bsdinstall/bsdinstall-timezone-confirm.png differ
diff --git a/share/images/books/handbook/bsdinstall/bsdinstall-timezone-country.png b/share/images/books/handbook/bsdinstall/bsdinstall-timezone-country.png
index b8bccc59c6..4a418864d7 100644
Binary files a/share/images/books/handbook/bsdinstall/bsdinstall-timezone-country.png and b/share/images/books/handbook/bsdinstall/bsdinstall-timezone-country.png differ
diff --git a/share/images/books/handbook/bsdinstall/bsdinstall-timezone-date.png b/share/images/books/handbook/bsdinstall/bsdinstall-timezone-date.png
new file mode 100644
index 0000000000..f72d294d83
Binary files /dev/null and b/share/images/books/handbook/bsdinstall/bsdinstall-timezone-date.png differ
diff --git a/share/images/books/handbook/bsdinstall/bsdinstall-timezone-region.png b/share/images/books/handbook/bsdinstall/bsdinstall-timezone-region.png
index 8b321036fc..03d2138e64 100644
Binary files a/share/images/books/handbook/bsdinstall/bsdinstall-timezone-region.png and b/share/images/books/handbook/bsdinstall/bsdinstall-timezone-region.png differ
diff --git a/share/images/books/handbook/bsdinstall/bsdinstall-timezone-time.png b/share/images/books/handbook/bsdinstall/bsdinstall-timezone-time.png
new file mode 100644
index 0000000000..3fe48c5e57
Binary files /dev/null and b/share/images/books/handbook/bsdinstall/bsdinstall-timezone-time.png differ
diff --git a/share/images/books/handbook/bsdinstall/bsdinstall-timezone-zone.png b/share/images/books/handbook/bsdinstall/bsdinstall-timezone-zone.png
index 87d0a2f675..3a233bae52 100644
Binary files a/share/images/books/handbook/bsdinstall/bsdinstall-timezone-zone.png and b/share/images/books/handbook/bsdinstall/bsdinstall-timezone-zone.png differ