diff --git a/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml b/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml
index 3a468ed88d..1b888140ae 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml
@@ -1,351 +1,380 @@
 <!-- $FreeBSD$ -->
 
     <sect2>
       <title>The &os; Documentation Engineering Team</title>
 
       <para>The &os; documentation engineering team is made up of the
 	following unelected individuals:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>&a.nik;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.ru;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.blackend;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.hrs;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.murray;</para>
 	</listitem>
       </itemizedlist>
     </sect2>
 
     <sect2>
       <title>The &os; Port Management Team</title>
 
       <para>The &os; port management team is made up of the
 	following unelected individuals:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>&a.marcus;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.clement;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.erwin;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.linimon;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.kris;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.krion;</para>
 	</listitem>
       </itemizedlist>
     </sect2>
 
 
     <sect2>
       <title>The &os; Donations Team</title>
 
       <para>The &os; donations liaison team is made up of the
 	following designated individuals:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>&a.wilko; (core team liaison)</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.brueffer;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.mwlucas;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.obrien;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.trhodes;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.rwatson;</para>
 	</listitem>
       </itemizedlist>
     </sect2>
 
     <sect2 id="staff-secteam">
       <title>The &os; Security Team</title>
 
       <para>The &os; security team is made up of the following
 	designated individuals:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>&a.remko;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.simon;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.cperciva;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.csjp;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.des;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.nectar;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.rwatson;</para>
 	</listitem>
       </itemizedlist>
     </sect2>
+  </sect1>
 
+  <sect1 id="misc">
+    <title>Miscellaneous Hats</title>
 
     <sect2>
-      <title>Misc Hats</title>
+      <title>The &os; Bugmeisters and <acronym>GNATS</acronym> admins</title>
 
-      <para>The &os; Bugmeisters and <acronym>GNATS</acronym> admins:</para>
+      <para>The &os; bugmeisters and <acronym>GNATS</acronym> admins are the
+        following individuals:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>&a.ceri;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.linimon;</para>
 	</listitem>
       </itemizedlist>
+    </sect2>
+
+    <sect2>
+      <title>The &os; Security Officers</title>
 
-      <para>The &os; security officer:</para>
+      <para>The &os; security officers are the following individuals:</para>
 
       <itemizedlist>
 	<listitem>
-	  <para>&a.cperciva;</para>
+	  <para>&a.cperciva; (Officer)</para>
 	</listitem>
       </itemizedlist>
 
-      <para>The &os; security officer deputy:</para>
+      <itemizedlist>
+	<listitem>
+	  <para>&a.simon; (Officer Deputy)</para>
+	</listitem>
+      </itemizedlist>
 
       <itemizedlist>
 	<listitem>
-	  <para>&a.simon;</para>
+	  <para>&a.nectar; (Officer Emeritus)</para>
 	</listitem>
       </itemizedlist>
+    </sect2>
+
+    <sect2>
+    <title>The &os; Core Team Secretary</title>
+
+      <para>The &os; core team secretary is the following individual:</para>
 
-      <para>The &os; core team secretary:</para>
       <itemizedlist>
 	<listitem>
 	  <para>&a.wilko;</para>
 	</listitem>
       </itemizedlist>
 
     </sect2>
+
+    <sect2>
+    <title>The &os; Port Management Team Secretary</title>
+
+      <para>The &os; port management team secretary is the following
+        individual:</para>
+      <itemizedlist>
+	<listitem>
+	  <para>&a.erwin;</para>
+	</listitem>
+      </itemizedlist>
+    </sect2>
   </sect1>
 
   <sect1 id="staff-re">
     <title>&os; Release Engineering Teams</title>
 
     <sect2>
       <title>Primary &os; Release Engineering Team</title>
 
       <para>The primary release engineering team is made up of the
 	following delegated individuals:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>&a.scottl;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.hrs;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.kensmith;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.murray;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.rwatson;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.dwhite;</para>
 	</listitem>
       </itemizedlist>
     </sect2>
 
     <sect2>
       <title>Alpha Release Engineering Team</title>
 
       <para>The Alpha release engineering team is made up of the
 	following delegated individuals:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>&a.wilko;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.scottl;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.murray;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.rwatson;</para>
 	</listitem>
       </itemizedlist>
     </sect2>
 
     <sect2>
       <title>AMD64 Release Engineering Team</title>
 
       <para>The AMD64 release engineering team is made up of the
 	following delegated individual:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>&a.obrien;</para>
 	</listitem>
       </itemizedlist>
     </sect2>
 
     <sect2>
       <title>IA-64 Release Engineering Team</title>
 
       <para>The IA-64 release engineering team is made up of the
 	following delegated individual:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>&a.marcel;</para>
 	</listitem>
       </itemizedlist>
     </sect2>
 
     <sect2>
       <title>i386 Release Engineering Team</title>
 
       <para>The i386 release engineering team is made up of the
 	following delegated individuals:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>&a.scottl;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.murray;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.rwatson;</para>
 	</listitem>
       </itemizedlist>
     </sect2>
 
     <sect2>
       <title>PC98 Release Engineering Team</title>
 
       <para>The PC98 release engineering team is made up of the
 	following delegated individual:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>&a.nyan;</para>
 	</listitem>
       </itemizedlist>
     </sect2>
 
     <sect2>
       <title>PowerPC Release Engineering Team</title>
 
       <para>The PowerPC release engineering team is made up of the
 	following delegated individual:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>&a.grehan;</para>
 	</listitem>
       </itemizedlist>
     </sect2>
 
     <sect2>
       <title>Sparc64 Release Engineering Team</title>
 
       <para>The Sparc64 release engineering team is made up of
 	the following delegated individuals:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>&a.jake;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.phk;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.scottl;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.tmm;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.obrien;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.kensmith;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.murray;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.rwatson;</para>
 	</listitem>
       </itemizedlist>
     </sect2>