diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml
index 4eb121746e..9531faf713 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.xml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.xml
@@ -4014,22 +4014,26 @@ MFC after:          1 month</programlisting>
 
 		  <step>
 		    <para>Upgrade the copied port to the new version.
-		      Remember to change the
-		      <varname>LATEST_LINK</varname> so there are no
+		      Remember to add or change the
+		      <varname>PKGNAMEPREFIX</varname> or
+		      <varname>PKGNAMESUFFIX</varname> so there are no
 		      duplicate ports with the same name.  In some
 		      rare cases it may be necessary to change the
-		      <varname>PORTNAME</varname> instead of
-		      <varname>LATEST_LINK</varname>, but this should
-		      only be done when it is really needed &mdash;
-		      e.g., using an existing port as the base for a
-		      very similar program with a different name, or
-		      upgrading a port to a new upstream version which
-		      actually changes the distribution name, like the
-		      transition from
+		      <varname>PORTNAME</varname> instead of adding
+		      <varname>PKGNAMEPREFIX</varname> or
+		      <varname>PKGNAMESUFFIX</varname>, but this
+		      should only be done when it is really needed
+		      &mdash; e.g., using an existing port as the base
+		      for a very similar program with a different
+		      name, or upgrading a port to a new upstream
+		      version which actually changes the distribution
+		      name, like the transition from
 		      <filename>textproc/libxml</filename> to
 		      <filename>textproc/libxml2</filename>.  In most
-		      cases, changing <varname>LATEST_LINK</varname>
-		      should suffice.</para>
+		      cases, adding or changing
+		      <varname>PKGNAMEPREFIX</varname> or
+		      <varname>PKGNAMESUFFIX</varname> should
+		      suffice.</para>
 		  </step>
 
 		  <step>
diff --git a/en_US.ISO8859-1/books/porters-handbook/book.xml b/en_US.ISO8859-1/books/porters-handbook/book.xml
index 998e6964ac..4f5e3e8e7f 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.xml
@@ -1238,41 +1238,6 @@ PORTEPOCH=	1</programlisting>
 	  them part of <varname>PORTNAME</varname>.</para>
       </sect2>
 
-      <sect2>
-	<title><varname>LATEST_LINK</varname></title>
-
-	<para><varname>LATEST_LINK</varname> is used during package
-	  building to determine a shortened name to create links that
-	  can be used by <command>pkg_add -r</command>.  This makes it
-	  possible to, for example, install the latest perl version by
-	  running <command>pkg_add -r perl</command> without knowing
-	  the exact version number.  This name needs to be unique and
-	  obvious to users.</para>
-
-	<para>In some cases, several versions of a program may be
-	  present in the ports collection at the same time.  Both the
-	  index build and the package build system need to be able to
-	  see them as different, independent ports, although they may
-	  all have the same <varname>PORTNAME</varname>,
-	  <varname>PKGNAMEPREFIX</varname>, and even
-	  <varname>PKGNAMESUFFIX</varname>.  In those cases, the
-	  optional <varname>LATEST_LINK</varname> variable should be
-	  set to a different value for all ports except the
-	  <quote>main</quote> one &mdash; see the
-	  <filename>lang/gcc46</filename> and
-	  <filename>lang/gcc</filename> ports, and the
-	  <filename>www/apache*</filename> family for examples of its
-	  use.  By setting <varname>NO_LATEST_LINK</varname>, no link
-	  will be generated, which may be an option for all but the
-	  <quote>main</quote> version.  Note that how to choose a
-	  <quote>main</quote> version &mdash;
-	  <quote>most popular</quote>, <quote>best supported</quote>,
-	  <quote>least patched</quote>, and so on &mdash; is outside
-	  the scope of this handbook's recommendations; we only tell
-	  you how to specify the other ports' versions after you have
-	  picked a <quote>main</quote> one.</para>
-      </sect2>
-
       <sect2 xml:id="porting-pkgname">
 	<title>Package Naming Conventions</title>
 
@@ -1341,9 +1306,8 @@ PORTEPOCH=	1</programlisting>
 	      <varname>PORTNAME</varname>, as the
 	      <filename>www/apache*</filename> ports do; in that case,
 	      different versions (and different index entries) are
-	      distinguished by the <varname>PKGNAMEPREFIX</varname>,
-	      <varname>PKGNAMESUFFIX</varname>, and
-	      <varname>LATEST_LINK</varname> values.</para>
+	      distinguished by the <varname>PKGNAMEPREFIX</varname>
+	      and <varname>PKGNAMESUFFIX</varname> values.</para>
 	  </listitem>
 
 	  <listitem>
diff --git a/en_US.ISO8859-1/htdocs/portmgr/qa.xml b/en_US.ISO8859-1/htdocs/portmgr/qa.xml
index 8e2ceb5b71..897c6c82eb 100644
--- a/en_US.ISO8859-1/htdocs/portmgr/qa.xml
+++ b/en_US.ISO8859-1/htdocs/portmgr/qa.xml
@@ -153,14 +153,6 @@ two main categories:
 	the port.  (This email is not automated but it should be sent
 	as a courtesy.)</p></li>
 
-      <li><p>a list of ports that do not set NO_LATEST_LINK.  (Ports
-	that have a stable version, and a development version, will
-	generally have the development version set to a later revision.
-	If it is desirable that users should install the stable version
-	from packages, rather than the development version, this flag
-	should be set; otherwise, users will get the latest version by
-	default.)</p></li>
-
     </ul>
 
   </li>