diff --git a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
index 3df7fdd0c5..dbddd58f41 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
@@ -3537,7 +3537,7 @@ dhcp_flags=""</programlisting>
 	    <secondary>installation</secondary>
 	  </indexterm>
 	  <para>In order to configure your FreeBSD system as a DHCP server,
-	    you will need to ensure that the <devicename>bpf</devicename>
+	    you will need to ensure that the &man.bpf.4;
 	    device is compiled into your kernel.  To do this, add
 	    <literal>pseudo-device bpf</literal> to your kernel
 	    configuration file, and rebuild the kernel.  For more
@@ -3566,7 +3566,10 @@ dhcp_flags=""</programlisting>
 	    <filename>dhcpd.conf</filename> which was installed by the
 	    <filename role="package">net/isc-dhcp3</filename> port.
 	    By default, this will be
-	    <filename>/usr/local/etc/dhcpd.conf</filename>.</para>
+	    <filename>/usr/local/etc/dhcpd.conf.sample</filename>, and you
+	    should copy this to
+	    <filename>/usr/local/etc/dhcpd.conf</filename> before proceeding
+	    to make changes.</para>
 	</sect3>
 
 	<sect3>
@@ -3686,7 +3689,7 @@ host mailhost {
 	    <listitem><para><filename>/usr/local/sbin/dhcpd</filename></para>
 	      <para><application>dhcpd</application> is statically linked and
 		resides in <filename>/usr/local/sbin</filename>.  The 
-		<filename>dhcpd.8</filename> manual page installed with the
+		dhcpd(8) manual page installed with the
 		port gives more information about
 		<application>dhcpd</application>.</para>
 	    </listitem>
@@ -3698,14 +3701,14 @@ host mailhost {
 		contain all the information that should be provided to clients
 		that are being serviced, along with information regarding the
 		operation of the server. This configuration file is described
-		by the <filename>dhcpd.conf.5</filename> manual page installed
+		by the dhcpd.conf(5) manual page installed
 		by the port.</para>
 	    </listitem>
  
 	    <listitem><para><filename>/var/db/dhcpd.leases</filename></para>
 	      <para>The DHCP server keeps a database of leases it has issued
 		in this file, which is written as a log.  The manual page
-		<filename>dhcpd.leases.5</filename>, installed by the port
+		dhcpd.leases(5), installed by the port
 		gives a slightly longer description.</para>
 	    </listitem>
  
@@ -3713,7 +3716,7 @@ host mailhost {
 	      <para><application>dhcrelay</application> is used in advanced
 		environments where one DHCP server forwards a request from a
 		client to another DHCP server on a separate network. The
-		<filename>dhcrelay.8</filename> manual page provided with the
+		dhcrelay(8) manual page provided with the
 		port contains more detail.</para>
 	    </listitem>
 	  </itemizedlist>