Index: head/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml
===================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml
+++ head/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml
@@ -114,11 +114,19 @@
 
   <para>To submit the diff, use the <link
       xlink:href="https://bugs.freebsd.org/submit/">bug submit
-      form</link> (category <literal>Ports Tree</literal>).  If the
+      form</link> (product <literal>Ports &amp; Packages</literal>,
+    component <literal>Individual Port(s)</literal>).  If the
     submitter is also
-    maintaining the port, be sure to put <literal>[maintainer
-      update]</literal> at the beginning of the
-    <literal>Summary</literal> line.
+    maintaining the port, be sure to put
+    <literal>[MAINTAINER]</literal> at the beginning of the
+    <literal>Summary</literal> line.  Always include the category
+    with the port name, followed by colon, and brief descripton of the
+    issue.  For example:
+    <literal><replaceable>category/portname</replaceable>:
+      <replaceable>add FOO option</replaceable></literal>, or if
+    maintaining the port, <literal>[MAINTAINER]
+      <replaceable>category/portname</replaceable>:
+      <replaceable>Update to X.Y</replaceable></literal>.
     Please mention any added or
     deleted files in the message, as they have to be explicitly
     specified to &man.svn.1; when doing a commit.  Do not compress or