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 7d4188610f..634f0622eb 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -4557,50 +4557,36 @@ Received 264951 bytes in 0.1 seconds</screen>
 	</listitem>
       </itemizedlist>
 
-	<para>To automatically configure a machine on a
-	  <acronym>LAN</acronym> which acts as a client, not a
-	  router, two items are required.  First to enable the
-	  <filename>em0</filename> to receive the router
-	  solicitation messages, add this line to
+	<para>To configure a &os; system as an
+	  <acronym>IPv6</acronym> client, add these two lines to
 	  <filename>rc.conf</filename>:</para>
 
-	<programlisting>ifconfig_<replaceable>em0</replaceable>_ipv6="inet6 accept_rtadv"</programlisting>
+	<programlisting>ifconfig_<replaceable>em0</replaceable>_ipv6="inet6 accept_rtadv"
+rtsold_enable="YES"</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>The first line enables the specified interface to receive
+	  router solicitation messages.  The second line enables the
+	  router solicitation daemon, &man.rtsol.8;.</para>
 
 	<para>For &os;&nbsp;8.<replaceable>x</replaceable>,
-	  add:</para>
+	  add a third line:</para>
 
 	<programlisting>ipv6_enable="YES"</programlisting>
 
-	<para>To statically assign the <acronym>IPv6</acronym>
-	  address,
-	  <systemitem>2001:db8:4672:6565:2026:5043:2d42:5344</systemitem>,
-	  to <filename>fxp0</filename>, add the following for
-	  &os;&nbsp;9.<replaceable>x</replaceable>:</para>
+	<para>If the interface needs a statically assigned <acronym>IPv6</acronym>
+	  address, add an entry to specify the static address and
+	  associated prefix length:</para>
 
-	<programlisting>ifconfig_<replaceable>fxp0</replaceable>_ipv6="inet6 2001:db8:4672:6565:2026:5043:2d42:5344 prefixlen 64"</programlisting>
+	<programlisting>ifconfig_<replaceable>fxp0</replaceable>_ipv6="inet6 <replaceable>2001:db8:4672:6565:2026:5043:2d42:5344</replaceable> prefixlen <replaceable>64</replaceable>"</programlisting>
 
-	<note>
-	  <para>Be sure to change <replaceable>prefixlen
-	      64</replaceable> to the appropriate value for the
-	    subnet.</para>
-	</note>
+	<para>On a &os;&nbsp;8.<replaceable>x</replaceable> system,
+	  that line uses this format instead:</para>
 
-	<para>For &os;&nbsp;8.<replaceable>x</replaceable>,
-	  add:</para>
+	<programlisting>ipv6_ifconfig_<replaceable>fxp0</replaceable>="<replaceable>2001:db8:4672:6565:2026:5043:2d42:5344</replaceable>"</programlisting>
 
-	<programlisting>ipv6_ifconfig_<replaceable>fxp0</replaceable>="2001:db8:4672:6565:2026:5043:2d42:5344"</programlisting>
+	<para>To assign a default router, specify its address:</para>
 
-	<para>To assign a default router of
-	  <systemitem>2001:db8:4672:6565::1</systemitem>, add the
-	  following to <filename>/etc/rc.conf</filename>:</para>
-
-	<programlisting>ipv6_defaultrouter="2001:db8:4672:6565::1"</programlisting>
+	<programlisting>ipv6_defaultrouter="<replaceable>2001:db8:4672:6565::1</replaceable>"</programlisting>
       </sect2>
 
       <sect2>