diff --git a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index c165da5277..e7478b7175 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -5319,29 +5319,38 @@ redirect_port tcp 192.168.0.3:80 80</programlisting>
 	<filename>/etc/rc.conf</filename></title>
 
       <sect3>
-	<title><acronym>IPv6</acronym> Client Settings</title>
+	<title><acronym>IPv6</acronym> Client Auto-Configuration</title>
 
-	<para>These settings configure a machine on a
+	<para>To automatically configure a machine on a
 	  <acronym>LAN</acronym> which acts as a client, not a
-	  router.  To instruct &man.rtsol.8; to autoconfigure the
-	  interface on boot on
-	  &os;&nbsp;9.<replaceable>x</replaceable> and later, add
-	  this line to <filename>rc.conf</filename>:</para>
-
-	<programlisting>ipv6_prefer="YES"</programlisting>
+	  router, two items are required.  First to enable the
+	  <devicename>em0</devicename> to receive the router solicitation
+	  messages, add this line to <filename>rc.conf</filename>:</para>
+	
+	<programlisting>ifconfig_<replaceable>em0</replaceable>_ipv6="inet6 accept_rtadv"</programlisting>
+	
+	<para>Secondly, the router solicitation daemon, &man.rtsol.8;,
+	  should be enabled by adding the following to
+	  <filename>rc.conf</filename>:</para>
+	
+	<programlisting>rtsold_enable="YES"</programlisting>
 
 	<para>For &os;&nbsp;8.<replaceable>x</replaceable>,
 	  add:</para>
 
 	<programlisting>ipv6_enable="YES"</programlisting>
+	  </sect3>
+	  <sect3>
+	    <title><acronym>IPv6</acronym> Client Static
+	      Configuration</title>
 
 	<para>To statically assign the <acronym>IPv6</acronym>
 	  address, <hostid
-	    role="ip6addr">2001:471:1f11:251:290:27ff:fee0:2093</hostid>,
+	    role="ip6addr">2001:db8:4672:6565:2026:5043:2d42:5344</hostid>,
 	  to <devicename>fxp0</devicename>, add the following for
 	  &os;&nbsp;9.<replaceable>x</replaceable>:</para>
 
-	<programlisting>ifconfig_fxp0_ipv6="inet6 2001:471:1f11:251:290:27ff:fee0:2093 prefixlen <replaceable>64</replaceable>"</programlisting>
+	<programlisting>ifconfig_<replaceable>fxp0</replaceable>_ipv6="inet6 2001:db8:4672:6565:2026:5043:2d42:5344 prefixlen 64"</programlisting>
 
 	<note>
 	  <para>Be sure to change <replaceable>prefixlen
@@ -5349,16 +5358,16 @@ redirect_port tcp 192.168.0.3:80 80</programlisting>
 	    subnet.</para>
 	</note>
 
-	<para>For &os;&nbsp;8<replaceable>x</replaceable>,
+	<para>For &os;&nbsp;8.<replaceable>x</replaceable>,
 	  add:</para>
 
-	<programlisting>ipv6_ifconfig_fxp0="2001:471:1f11:251:290:27ff:fee0:2093"</programlisting>
+	<programlisting>ipv6_ifconfig_<replaceable>fxp0</replaceable>="2001:db8:4672:6565:2026:5043:2d42:5344"</programlisting>
 
 	<para>To assign a default router of <hostid
-	    role="ip6addr">2001:471:1f11:251::1</hostid>, add the
+	    role="ip6addr">2001:db8:4672:6565::1</hostid>, add the
 	  following to <filename>/etc/rc.conf</filename>:</para>
 
-	<programlisting>ipv6_defaultrouter="2001:471:1f11:251::1"</programlisting>
+	<programlisting>ipv6_defaultrouter="2001:db8:4672:6565::1"</programlisting>
       </sect3>
 
       <sect3>
@@ -5372,9 +5381,9 @@ redirect_port tcp 192.168.0.3:80 80</programlisting>
 
 	<para>The first entry lists the generic tunneling interfaces
 	  to be configured.  This example configures one interface,
-	  <devicename>gif0</devicename>:</para>
+	  <devicename>gif<replaceable>0</replaceable></devicename>:</para>
 
-	<programlisting>gif_interfaces="gif0"</programlisting>
+	<programlisting>gif_interfaces="gif<replaceable>0</replaceable>"</programlisting>
 
 	<para>To configure that interface with a local endpoint of
 	  <replaceable>MY_IPv4_ADDR</replaceable> to a remote endpoint