diff --git a/en_US.ISO8859-1/articles/pr-guidelines/article.sgml b/en_US.ISO8859-1/articles/pr-guidelines/article.sgml
index b3829d0c6c..4a9aff97a0 100644
--- a/en_US.ISO8859-1/articles/pr-guidelines/article.sgml
+++ b/en_US.ISO8859-1/articles/pr-guidelines/article.sgml
@@ -344,7 +344,7 @@
 	    </row>
 
 	    <row>
-	      <entry>USB subsystem</entry>
+	      <entry>&man.usb.4; subsystem</entry>
 	      <entry>usb</entry>
 	      <entry>freebsd-usb</entry>
 	    </row>
@@ -384,15 +384,71 @@
 	  </thead>
 
 	  <tbody>
+	    <row>
+	      <entry>problem specific to the &arm; architecture</entry>
+	      <entry>kern</entry>
+	      <entry>freebsd-arm</entry>
+	    </row>
+
+	    <row>
+	      <entry>problem specific to the &mips; architecture</entry>
+	      <entry>kern</entry>
+	      <entry>freebsd-mips</entry>
+	    </row>
+
+	    <row>
+	      <entry>problem specific to the &powerpc; architecture</entry>
+	      <entry>kern</entry>
+	      <entry>freebsd-ppc</entry>
+	    </row>
+
 	    <row>
 	      <entry>problem with Advanced Configuration and Power
-		Management (ACPI)</entry>
+		Management (&man.acpi.4;)</entry>
 	      <entry>kern</entry>
 	      <entry>freebsd-acpi</entry>
 	    </row>
 
 	    <row>
-	      <entry>problem with Linux or SVR4 emulation</entry>
+	      <entry>problem with Asynchronous Transfer Mode (ATM)
+		drivers</entry>
+	      <entry>kern</entry>
+	      <entry>freebsd-atm</entry>
+	    </row>
+
+	    <row>
+	      <entry>problem with &firewire; drivers</entry>
+	      <entry>kern</entry>
+	      <entry>freebsd-firewire</entry>
+	    </row>
+
+	    <row>
+	      <entry>problem with the filesystem code</entry>
+	      <entry>kern</entry>
+	      <entry>freebsd-fs</entry>
+	    </row>
+
+	    <row>
+	      <entry>problem with the &man.geom.4; subsystem</entry>
+	      <entry>kern</entry>
+	      <entry>freebsd-geom</entry>
+	    </row>
+
+	    <row>
+	      <entry>problem with the &man.ipfw.4; subsystem</entry>
+	      <entry>kern</entry>
+	      <entry>freebsd-ipfw</entry>
+	    </row>
+
+	    <row>
+	      <entry>problem with Integrated Services Digital Network
+		(ISDN) drivers</entry>
+	      <entry>kern</entry>
+	      <entry>freebsd-isdn</entry>
+	    </row>
+
+	    <row>
+	      <entry>problem with &linux; or SVR4 emulation</entry>
 	      <entry>kern</entry>
 	      <entry>emulation</entry>
 	    </row>
@@ -410,22 +466,35 @@
 	    </row>
 
 	    <row>
-	      <entry>problem with the SCSI subsystem</entry>
+	      <entry>problem with the &man.pf.4; subsystem</entry>
+	      <entry>kern</entry>
+	      <entry>freebsd-pf</entry>
+	    </row>
+
+	    <row>
+	      <entry>problem with the &man.scsi.4; subsystem</entry>
 	      <entry>kern</entry>
 	      <entry>freebsd-scsi</entry>
 	    </row>
 
 	    <row>
-	      <entry>problem with the sound subsystem</entry>
+	      <entry>problem with the &man.sound.4; subsystem</entry>
 	      <entry>kern</entry>
 	      <entry>freebsd-multimedia</entry>
 	    </row>
 
 	    <row>
-	      <entry>problem with <application>sysinstall</application></entry>
+	      <entry>problem with &man.sysinstall.8;</entry>
 	      <entry>bin</entry>
 	      <entry>freebsd-qa</entry>
 	    </row>
+
+	    <row>
+	      <entry>problem with the system startup scripts
+		(&man.rc.8;)</entry>
+	      <entry>kern</entry>
+	      <entry>freebsd-rc</entry>
+	    </row>
 	  </tbody>
       </table>
 
@@ -454,6 +523,12 @@
 	      <entry>apache</entry>
 	    </row>
 
+	    <row>
+	      <entry>port which is maintained by eclipse@FreeBSD.org</entry>
+	      <entry>ports</entry>
+	      <entry>freebsd-eclipse</entry>
+	    </row>
+
 	    <row>
 	      <entry>port which is maintained by gnome@FreeBSD.org</entry>
 	      <entry>ports</entry>
@@ -466,6 +541,12 @@
 	      <entry>haskell</entry>
 	    </row>
 
+	    <row>
+	      <entry>port which is maintained by java@FreeBSD.org</entry>
+	      <entry>ports</entry>
+	      <entry>freebsd-java</entry>
+	    </row>
+
 	    <row>
 	      <entry>port which is maintained by kde@FreeBSD.org</entry>
 	      <entry>ports</entry>
@@ -482,7 +563,13 @@
 	    <row>
 	      <entry>port which is maintained by perl@FreeBSD.org</entry>
 	      <entry>ports</entry>
-	      <entry>freebsd-perl</entry>
+	      <entry>perl</entry>
+	    </row>
+
+	    <row>
+	      <entry>port which is maintained by python@FreeBSD.org</entry>
+	      <entry>ports</entry>
+	      <entry>freebsd-python</entry>
 	    </row>
 
 	    <row>