diff --git a/en_US.ISO8859-1/articles/pr-guidelines/article.sgml b/en_US.ISO8859-1/articles/pr-guidelines/article.sgml
index dea936c37f..adf87b127f 100644
--- a/en_US.ISO8859-1/articles/pr-guidelines/article.sgml
+++ b/en_US.ISO8859-1/articles/pr-guidelines/article.sgml
@@ -260,7 +260,8 @@
 	(placeholder) assignee.  These are always prepended with
 	<literal>freebsd-</literal>.  The exact value for this default
 	depends on the category; in most cases, it corresponds to a
-	specific &os; mailing list.  Here are some examples:</para>
+	specific &os; mailing list.  Here is the current list, with
+	the most common ones listed first:</para>
 
       <table id=default-assignees>
 	<title>Default Assignees</title>
@@ -311,7 +312,19 @@
 	    </row>
 
 	    <row>
-	      <entry>JVM problems</entry>
+	      <entry>threading libraries</entry>
+	      <entry>threads</entry>
+	      <entry>freebsd-threads</entry>
+	    </row>
+
+	    <row>
+	      <entry>USB subsystem</entry>
+	      <entry>usb</entry>
+	      <entry>freebsd-usb</entry>
+	    </row>
+
+	    <row>
+	      <entry>&java.virtual.machine; problems</entry>
 	      <entry>java</entry>
 	      <entry>freebsd-java</entry>
 	    </row>
@@ -341,7 +354,7 @@
 
       <note>
 	<para>Here is a sample list of such entities; it is probably
-	  not complete.  Entries that have the short form are
+	  not complete.  In some cases, entries that have the short form are
 	  <emphasis>aliases</emphasis>, not mailing lists.</para>
       </note>
 
@@ -351,85 +364,102 @@
 	  <thead>
 	    <row>
 	      <entry>Type</entry>
+	      <entry>Suggested Category</entry>
 	      <entry>Suggested Assignee</entry>
 	    </row>
 	  </thead>
 
 	  <tbody>
+	    <row>
+	      <entry>problem with Advanced Configuration and Power
+		Management (ACPI)</entry>
+	      <entry>kern</entry>
+	      <entry>freebsd-acpi</entry>
+	    </row>
+
 	    <row>
 	      <entry>problem with Linux or SVR4 emulation</entry>
+	      <entry>kern</entry>
 	      <entry>emulation</entry>
 	    </row>
 
 	    <row>
 	      <entry>problem with the networking stack</entry>
+	      <entry>kern</entry>
 	      <entry>freebsd-net</entry>
 	    </row>
 
 	    <row>
 	      <entry>problem with PicoBSD</entry>
+	      <entry>kern</entry>
 	      <entry>freebsd-small</entry>
 	    </row>
 
 	    <row>
 	      <entry>problem with the ports framework
 		(<emphasis>not</emphasis> with an individual port!)</entry>
+	      <entry>ports</entry>
 	      <entry>portmgr</entry>
 	    </row>
 
 	    <row>
 	      <entry>problem with the SCSI subsystem</entry>
+	      <entry>kern</entry>
 	      <entry>freebsd-scsi</entry>
 	    </row>
 
 	    <row>
 	      <entry>problem with the sound subsystem</entry>
-	      <entry>sound</entry>
-	    </row>
-
-	    <row>
-	      <entry>problem with the threads subsystem</entry>
-	      <entry>freebsd-threads</entry>
+	      <entry>kern</entry>
+	      <entry>freebsd-multimedia</entry>
 	    </row>
 
 	    <row>
 	      <entry>problem with <application>sysinstall</application></entry>
+	      <entry>bin</entry>
 	      <entry>freebsd-qa</entry>
 	    </row>
 
 	    <row>
-	      <entry>problem with the USB subsystem</entry>
-	      <entry>freebsd-usb</entry>
+	      <entry>port which is maintained by apache@FreeBSD.org</entry>
+	      <entry>ports</entry>
+	      <entry>apache</entry>
 	    </row>
 
 	    <row>
 	      <entry>port which is maintained by gnome@FreeBSD.org</entry>
+	      <entry>ports</entry>
 	      <entry>gnome</entry>
 	    </row>
 
 	    <row>
 	      <entry>port which is maintained by haskell@FreeBSD.org</entry>
+	      <entry>ports</entry>
 	      <entry>haskell</entry>
 	    </row>
 
 	    <row>
 	      <entry>port which is maintained by kde@FreeBSD.org</entry>
+	      <entry>ports</entry>
 	      <entry>kde</entry>
 	    </row>
 
 	    <row>
 	      <entry>port which is maintained by
 		openoffice@FreeBSD.org</entry>
+	      <entry>ports</entry>
 	      <entry>freebsd-openoffice</entry>
 	    </row>
 
 	    <row>
 	      <entry>port which is maintained by perl@FreeBSD.org</entry>
+	      <entry>ports</entry>
 	      <entry>freebsd-perl</entry>
 	    </row>
 
 	    <row>
 	      <entry>port which is maintained by x11@FreeBSD.org</entry>
+	      <entry>ports</entry>
 	      <entry>freebsd-x11</entry>
 	    </row>
 	  </tbody>