diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index 430510677b..5f22dd88e2 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -1559,13 +1559,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
       </varlistentry>
 
       <varlistentry>
-	<term>&a.murray;</term>
-	<term>&a.dwhite;</term>
-	<term>&a.rwatson;</term>
-	<term>&a.kensmith;</term>
-	<term>&a.hrs;</term>
-	<term>&a.mux;</term>
-	<term>&a.bmah;</term>
+	<term>&team.re;</term>
 
 	<listitem>
 	  <para>These are the members of the &a.re;.  This team is
diff --git a/share/sgml/freebsd.ent b/share/sgml/freebsd.ent
index aed522bae9..ada002ef4f 100644
--- a/share/sgml/freebsd.ent
+++ b/share/sgml/freebsd.ent
@@ -84,6 +84,9 @@ used in both environments.
 <!ENTITY os.numports "20,000">
 <!ENTITY ports.size "417&nbsp;MB">
 
+<!-- Teams and Hats -->
+<!ENTITY team.re "&a.kib;, &a.blackend;, &a.jpaetzel;, &a.hrs;, &a.kensmith;, &a.rwatson;, &a.bz;">
+
 <!-- GUI-buttons -->
 <!ENTITY gui.ok "<guibutton>[&nbsp;OK&nbsp;]</guibutton>">
 <!ENTITY gui.cancel "<guibutton>[&nbsp;Cancel&nbsp;]</guibutton>">