diff --git a/en_US.ISO8859-1/articles/pxe/article.sgml b/en_US.ISO8859-1/articles/pxe/article.sgml
index 17061f15cb..2db25484a1 100644
--- a/en_US.ISO8859-1/articles/pxe/article.sgml
+++ b/en_US.ISO8859-1/articles/pxe/article.sgml
@@ -90,7 +90,7 @@
 
     <procedure>
       <step>
-        <para>Install DHCP: Install <filename role="package">net/isc-dhcp3</filename> you can use this config file
+        <para>Install DHCP: Install <filename role="package">net/isc-dhcp3-server</filename> you can use this config file
           <ulink url="dhcpd.conf">
           <filename>dhcpd.conf</filename></ulink>, stick it in <filename>/usr/local/etc/</filename>.</para>
       </step>
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 f15a9de4a5..f6a1398c06 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
@@ -2402,7 +2402,7 @@ Exports list on foobar:
 	  <para>As of release 4.4, <application>isc-dhcp
   	    3.0</application> is not part of the base
 	    system.  You will first need to install the
-	    <filename role="package">net/isc-dhcp3</filename> port or the
+	    <filename role="package">net/isc-dhcp3-server</filename> port or the
 	    corresponding package.  Please refer to <xref linkend="ports">
 	    for general information about ports and packages.</para>
 
@@ -4500,7 +4500,7 @@ nis_client_flags="-S <replaceable>NIS domain</replaceable>,<replaceable>server</
         components of the ISC DHCP system.  The client-side program,
         <command>dhclient</command>, comes integrated within FreeBSD, and
         the server-side portion is available from the
-        <filename role="package">net/isc-dhcp3</filename> port.  The
+        <filename role="package">net/isc-dhcp3-server</filename> port.  The
         &man.dhclient.8;, &man.dhcp-options.5;, and &man.dhclient.conf.5;
         manual pages, in addition to the references below, are useful
         resources.</para>
@@ -4608,9 +4608,9 @@ dhcp_flags=""</programlisting>
         </indexterm>
         <para>The DHCP server, <command>dhcpd</command>, is included
           as part of the <filename
-          role="package">net/isc-dhcp3</filename> port in the ports
-          collection.  This port contains the full ISC DHCP
-          distribution, consisting of client, server, relay agent and
+          role="package">net/isc-dhcp3-server</filename> port in the ports
+          collection.  This port contains the ISC DHCP
+          server and
           documentation.
           </para>
     </sect2>
@@ -4674,7 +4674,7 @@ dhcp_flags=""</programlisting>
 
 	  <para>The server portion of the suite is not provided as part of
 	    FreeBSD, and so you will need to install the
-	    <filename role="package">net/isc-dhcp3</filename>
+	    <filename role="package">net/isc-dhcp3-server</filename>
 	    port to provide this service.  See <xref linkend="ports"> for
 	    more information on using the ports collection.</para>
 	</sect3>
@@ -4713,7 +4713,7 @@ dhcp_flags=""</programlisting>
 
 	  <para>The next thing that you will need to do is edit the sample
 	    <filename>dhcpd.conf</filename> which was installed by the
-	    <filename role="package">net/isc-dhcp3</filename> port.
+	    <filename role="package">net/isc-dhcp3-server</filename> port.
 	    By default, this will be
 	    <filename>/usr/local/etc/dhcpd.conf.sample</filename>, and you
 	    should copy this to
@@ -4863,7 +4863,9 @@ host mailhost {
 	    <listitem><para><filename>/usr/local/sbin/dhcrelay</filename></para>
 	      <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
+		client to another DHCP server on a separate network.  If you
+		require this functionality, then install the <filename
+		role="package">net/isc-dhcp3-server</filename> port.  The
 		&man.dhcrelay.8; manual page provided with the
 		port contains more detail.</para>
 	    </listitem>