diff --git a/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml b/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
index 977abb294d..c94325df71 100644
--- a/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
@@ -53,13 +53,16 @@
 	<varname>PORTVERSION</varname></title>
 
       <para>Set <varname>PORTNAME</varname> to the base
-	name of the port, and <varname>PORTVERSION</varname> to the
-	version number of the port.</para>
+	name of the port.  Set <varname>PORTVERSION</varname> to the
+	version number of the port unless
+	<varname>DISTVERSION</varname> is used (see
+	<xref linkend="makefile-distversion"/>).</para>
 
       <important>
-	<para>The package name must be unique among all of the ports
-	  tree.  Make sure that there is not already a port with the
-	  same <varname>PORTNAME</varname> and if there is add one of
+	<para>The package name must be unique across the entire ports
+	  tree.  Make sure that the <varname>PORTNAME</varname> is not
+	  already in use by an existing port.  If the name has already
+	  been used, add either
 	  <link
 	    linkend="porting-pkgnameprefix-suffix"><varname>PKGNAMEPREFIX</varname>
 	    or <varname>PKGNAMESUFFIX</varname></link>.</para>