diff --git a/en_US.ISO8859-1/share/sgml/teams.ent b/en_US.ISO8859-1/share/sgml/teams.ent
index 2d048a80df..480cb1a28c 100644
--- a/en_US.ISO8859-1/share/sgml/teams.ent
+++ b/en_US.ISO8859-1/share/sgml/teams.ent
@@ -1,40 +1,48 @@
 <!--
      Names and email address of teams of people working on specified
      tasks. Usally 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>admins@FreeBSD.org</email>">
 
 <!ENTITY a.core-secretary "Core Team Secretary <email>core-secretary@FreeBSD.org</email>">
 
-<!ENTITY a.cvs "CVS Repository Meisters <email>cvs@FreeBSD.org</email>">
+<!ENTITY a.cvs "CVS Repository Meisters <email>cvsadm@FreeBSD.org</email>">
 
 <!ENTITY a.cvsup-master "CVSup Mirror Site Coordinator <email>cvsup-master@FreeBSD.org</email>">
 
+<!ENTITY a.dcvs "CVS doc Repository Meisters <email>dcvs@FreeBSD.org</email>">
+
 <!ENTITY a.doceng "Documentation Engineering Team <email>doceng@FreeBSD.org</email>">
 
 <!ENTITY a.donations "Donations Liaison Office <email>donations@FreeBSD.org</email>">
 
 <!ENTITY a.faq "FAQ Maintainer <email>faq@FreeBSD.org</email>">
 
 <!ENTITY a.ftp-master "FTP Mirror Site Coordinator <email>ftp-master@FreeBSD.org</email>">
 
 <!ENTITY a.mirror-admin "FTP/WWW Mirror Site Coordinator <email>mirror-admin@FreeBSD.org</email>">
 
+<!ENTITY a.ncvs "CVS src Repository Meisters <email>ncvs@FreeBSD.org</email>">
+
+<!ENTITY a.pcvs "CVS ports Repository Meisters <email>pcvs@FreeBSD.org</email>">
+
 <!ENTITY a.portmgr "Ports Management Team <email>portmgr@FreeBSD.org</email>">
 
+<!ENTITY a.projcvs "CVS Third-Party Projects Repository Meisters <email>projcvs@FreeBSD.org</email>">
+
 <!ENTITY a.re "Release Engineering Team <email>re@FreeBSD.org</email>">
 
 <!ENTITY a.security-officer "Security Officer Team <email>security-officer@FreeBSD.org</email>">