Index: head/en_US.ISO8859-1/share/xml/teams.ent
===================================================================
--- head/en_US.ISO8859-1/share/xml/teams.ent	(revision 50350)
+++ head/en_US.ISO8859-1/share/xml/teams.ent	(revision 50351)
@@ -1,58 +1,58 @@
 <!--
      Names and email address of teams of people working on specified
      tasks. Usually they're just mail aliases set up at hub.FreeBSD.org
 
      Use these entities when referencing appropriate teams.
 
      Please keep this list in alphabetical order by entity names.
 
      IMPORTANT:  If you delete names from this file you *must* ensure that
                  all references to them have been removed from the handbook's
                  translations.  If they haven't then you *will* break the
                  builds for the other languages, and we will poke fun of you
                  in public.
 
      $FreeBSD$
 -->
 
 <!ENTITY a.admins "FreeBSD Administrators <email xmlns='http://docbook.org/ns/docbook'>admins@FreeBSD.org</email>">
 
-<!ENTITY a.clusteradm "Cluster Admin Team <email xmlns='http://docbook.org/ns/docbook'>clusteradm@FreeBSD.org</email>">
+<!ENTITY a.bugmeister "Problem Report Database administrators <email xmlns='http://docbook.org/ns/docbook'>bugmeister@FreeBSD.org</email>">
 
 <!ENTITY a.core "Core Team <email xmlns='http://docbook.org/ns/docbook'>core@FreeBSD.org</email>">
 
 <!ENTITY a.core-secretary "Core Team Secretary <email xmlns='http://docbook.org/ns/docbook'>core-secretary@FreeBSD.org</email>">
 
 <!ENTITY a.cvsadm "CVS Repository Meisters <email xmlns='http://docbook.org/ns/docbook'>cvsadm@FreeBSD.org</email>">
 
 <!ENTITY a.cvsup-master "CVSup Mirror Site Coordinator <email xmlns='http://docbook.org/ns/docbook'>cvsup-master@FreeBSD.org</email>">
 
 <!ENTITY a.doceng "Documentation Engineering Team <email xmlns='http://docbook.org/ns/docbook'>doceng@FreeBSD.org</email>">
 
 <!ENTITY a.donations "Donations Liaison Office <email xmlns='http://docbook.org/ns/docbook'>donations@FreeBSD.org</email>">
 
 <!ENTITY a.faq "FAQ Maintainer <email xmlns='http://docbook.org/ns/docbook'>faq@FreeBSD.org</email>">
 
 <!ENTITY a.ftp-master "FTP Mirror Site Coordinator <email xmlns='http://docbook.org/ns/docbook'>ftp-master@FreeBSD.org</email>">
 
 <!ENTITY a.mirror-admin "FTP/WWW Mirror Site Coordinator <email xmlns='http://docbook.org/ns/docbook'>mirror-admin@FreeBSD.org</email>">
 
 <!ENTITY a.ncvs "CVS src Repository Meisters <email xmlns='http://docbook.org/ns/docbook'>ncvs@FreeBSD.org</email>">
 
 <!ENTITY a.perforce-admin "Perforce Repository Meisters <email xmlns='http://docbook.org/ns/docbook'>perforce-admin@FreeBSD.org</email>">
 
 <!ENTITY a.pcvs "CVS ports Repository Meisters <email xmlns='http://docbook.org/ns/docbook'>pcvs@FreeBSD.org</email>">
 
 <!ENTITY a.portmgr "Ports Management Team <email xmlns='http://docbook.org/ns/docbook'>portmgr@FreeBSD.org</email>">
 
 <!ENTITY a.portmgr-secretary "Ports Management Team Secretary <email xmlns='http://docbook.org/ns/docbook'>portmgr-secretary@FreeBSD.org</email>">
 
 <!ENTITY a.ports-secteam "Ports Security Team <email xmlns='http://docbook.org/ns/docbook'>ports-secteam@FreeBSD.org</email>">
 
 <!ENTITY a.projcvs "CVS Third-Party Projects Repository Meisters <email xmlns='http://docbook.org/ns/docbook'>projcvs@FreeBSD.org</email>">
 
 <!ENTITY a.re "Release Engineering Team <email xmlns='http://docbook.org/ns/docbook'>re@FreeBSD.org</email>">
 
 <!ENTITY a.secteam-secretary "Security Team Secretary <email xmlns='http://docbook.org/ns/docbook'>secteam-secretary@FreeBSD.org</email>">
 
 <!ENTITY a.security-officer "Security Officer Team <email xmlns='http://docbook.org/ns/docbook'>security-officer@FreeBSD.org</email>">