diff --git a/en_US.ISO8859-1/books/porters-handbook/book.sgml b/en_US.ISO8859-1/books/porters-handbook/book.sgml
index 128ac78200..780c4f88b3 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.sgml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.sgml
@@ -8181,8 +8181,8 @@ lib/X11/oneko/sounds/cat.au
 	  empty due to other ports installing some files in there.</para>
       </sect1>
 
-      <sect1 id="dads-uid">
-	<title>UIDs</title>
+      <sect1 id="dads-uid-and-gids">
+	<title>UIDs and GIDs</title>
 
 	<para>If your port requires a certain user to be on the installed
 	  system, let the <filename>pkg-install</filename> script call
@@ -8273,7 +8273,7 @@ bacula:*:910:910:Bacula Daemon:/var/db/bacula:/sbin/nologin</programlisting>
 
 	<para>This is the current list of reserved GIDs.</para>
 
-	<!-- Please keep this list sorted by uid -->
+	<!-- Please keep this list sorted by gid -->
 	<!-- XXX incomplete! -->
 	<programlisting>bind:*:53:
 rdfdb:*:55:
@@ -8281,26 +8281,62 @@ cyrus:*:60:
 proxy:*:62:
 authpf:*:63:
 uucp:*:66:
+xten:*:67:
 dialer:*:68:
 network:*:69:
 pgsql:*:70:
 www:*:80:
 qnofiles:*:81:
 qmail:*:82:
+mysql:*:88:
+vpopmail:*:89:
+firebird:*:90:
 mailman:*:91:
+gdm:*:92:
+jabber:*:93:
+p4admin:*:94:
+interch:*:95:
+squeuer:*:96:
+mud:*:97:
+msql:*:98:
+rscsi:*:99:
+squid:*:100:
+quagga:*:101:
+ganglia:*:102:
+sgeadmin:*:103:
+slimserv:*:104:
+dnetc:*:105:
+clamav:*:106:
+cacti:*:107:
+webkit:*:108:
+quickml:*:109:
 vscan:*:110:
+fido:*:111:
 dcc:*:112:
+amavis:*:113:
+dhis:*:114:
+_symon:*:115:
 postfix:*:125:
 maildrop:*:126:
 rbldns:*:153:
+sfs:*:171:
+agk:*:172:
+polipo:*:173:
 moinmoin:*:192:
+sympa:*:200:
+dspam:*:202:
+_tor:*:256:
+ldap:*:389:
+drweb:*:426:
 courier:*:465:
 _bbstored:*:505:
 qtss:*:554:
 ircdru:*:555:
 messagebus:*:556:
 realtime:*:557:
-bopm:*:717:</programlisting>
+bnetd:*:700:
+bopm:*:717:
+bacula:*:910:</programlisting>
 
 	<para>Please include a notice when you submit a port (or an upgrade)
 	  that reserves a new UID or GID in this range.  This allows us to