diff --git a/de_DE.ISO8859-1/share/xml/teams.ent b/de_DE.ISO8859-1/share/xml/teams.ent
index 5f87c2a09a..8d0b55fcb2 100644
--- a/de_DE.ISO8859-1/share/xml/teams.ent
+++ b/de_DE.ISO8859-1/share/xml/teams.ent
@@ -1,59 +1,51 @@
admins@FreeBSD.org">
bugmeister@FreeBSD.org">
core-secretary@FreeBSD.org ">
cvsadm@FreeBSD.org">
-cvsup-master@FreeBSD.org">
-
-dcvs@FreeBSD.org">
-
doceng@FreeBSD.org">
donations@FreeBSD.org">
faq@FreeBSD.org">
ftp-master@FreeBSD.org">
mirror-admin@FreeBSD.org">
-ncvs@FreeBSD.org">
-
perforce-admin@FreeBSD.org">
pcvs@FreeBSD.org">
portmgr@FreeBSD.org">
portmgr-secretary@FreeBSD.org">
-projcvs@FreeBSD.org">
-
re@FreeBSD.org">
security-officer@FreeBSD.org">
www@FreeBSD.org">
diff --git a/el_GR.ISO8859-7/share/xml/teams.ent b/el_GR.ISO8859-7/share/xml/teams.ent
index d234d8468b..cd2a90d6ac 100644
--- a/el_GR.ISO8859-7/share/xml/teams.ent
+++ b/el_GR.ISO8859-7/share/xml/teams.ent
@@ -1,65 +1,57 @@
admins@FreeBSD.org">
bugmeister@FreeBSD.org">
core-secretary@FreeBSD.org">
cvsadm@FreeBSD.org">
-cvs@FreeBSD.org">
-
-dcvs@FreeBSD.org">
-
doceng@FreeBSD.org">
donations@FreeBSD.org">
faq@FreeBSD.org">
ftp-master@FreeBSD.org">
mirror-admin@FreeBSD.org">
-ncvs@FreeBSD.org">
-
perforce-admin@FreeBSD.org">
pcvs@FreeBSD.org">
portmgr@FreeBSD.org">
portmgr-secretary@FreeBSD.org">
-projcvs@FreeBSD.org">
-
re@FreeBSD.org">
security-officer@FreeBSD.org">
secteam-secretary@FreeBSD.org">
diff --git a/en_US.ISO8859-1/share/xml/teams.ent b/en_US.ISO8859-1/share/xml/teams.ent
index 85aa9b9c8f..1da57a6546 100644
--- a/en_US.ISO8859-1/share/xml/teams.ent
+++ b/en_US.ISO8859-1/share/xml/teams.ent
@@ -1,54 +1,50 @@
admins@FreeBSD.org">
bugmeister@FreeBSD.org">
core@FreeBSD.org">
core-secretary@FreeBSD.org">
cvsadm@FreeBSD.org">
doceng@FreeBSD.org">
donations@FreeBSD.org">
faq@FreeBSD.org">
ftp-master@FreeBSD.org">
mirror-admin@FreeBSD.org">
-ncvs@FreeBSD.org">
-
pcvs@FreeBSD.org">
portmgr@FreeBSD.org">
portmgr-secretary@FreeBSD.org">
ports-secteam@FreeBSD.org">
-projcvs@FreeBSD.org">
-
re@FreeBSD.org">
secteam-secretary@FreeBSD.org">
security-officer@FreeBSD.org">
diff --git a/es_ES.ISO8859-1/share/xml/teams.ent b/es_ES.ISO8859-1/share/xml/teams.ent
index 848b77f39c..6b016e7471 100644
--- a/es_ES.ISO8859-1/share/xml/teams.ent
+++ b/es_ES.ISO8859-1/share/xml/teams.ent
@@ -1,54 +1,46 @@
admins@FreeBSD.org">
core-secretary@FreeBSD.org">
cvsadm@FreeBSD.org">
-cvsup-master@FreeBSD.org">
-
-dcvs@FreeBSD.org">
-
doceng@FreeBSD.org">
donations@FreeBSD.org">
faq@FreeBSD.org">
ftp-master@FreeBSD.org">
mirror-admin@FreeBSD.org">
-ncvs@FreeBSD.org">
-
perforce-admin@FreeBSD.org">
portmgr@FreeBSD.org">
portmgr-secretary@FreeBSD.org">
-projcvs@FreeBSD.org">
-
re@FreeBSD.org">
security-officer@FreeBSD.org">
diff --git a/fr_FR.ISO8859-1/share/xml/teams.ent b/fr_FR.ISO8859-1/share/xml/teams.ent
index ba4a444528..19d870f4ca 100644
--- a/fr_FR.ISO8859-1/share/xml/teams.ent
+++ b/fr_FR.ISO8859-1/share/xml/teams.ent
@@ -1,59 +1,51 @@
admins@FreeBSD.org">
core-secretary@FreeBSD.org">
cvsadm@FreeBSD.org">
-cvsup-master@FreeBSD.org">
-
-dcvs@FreeBSD.org">
-
doceng@FreeBSD.org">
donations@FreeBSD.org">
faq@FreeBSD.org">
ftp-master@FreeBSD.org">
mirror-admin@FreeBSD.org">
-ncvs@FreeBSD.org">
-
perforce-admin@FreeBSD.org">
pcvs@FreeBSD.org">
portmgr@FreeBSD.org">
portmgr-secretary@FreeBSD.org">
-projcvs@FreeBSD.org">
-
re@FreeBSD.org">
security-officer@FreeBSD.org">
secteam-secretary@FreeBSD.org">
diff --git a/hu_HU.ISO8859-2/share/xml/teams.ent b/hu_HU.ISO8859-2/share/xml/teams.ent
index 11b9685f5f..3c41bc6a3c 100644
--- a/hu_HU.ISO8859-2/share/xml/teams.ent
+++ b/hu_HU.ISO8859-2/share/xml/teams.ent
@@ -1,57 +1,49 @@
admins@FreeBSD.org">
bugmeister@FreeBSD.org">
core-secretary@FreeBSD.org">
cvsadm@FreeBSD.org">
-cvsup-master@FreeBSD.org">
-
-dcvs@FreeBSD.org">
-
doceng@FreeBSD.org">
donations@FreeBSD.org">
faq@FreeBSD.org">
ftp-master@FreeBSD.org">
mirror-admin@FreeBSD.org">
-ncvs@FreeBSD.org">
-
perforce-admin@FreeBSD.org">
pcvs@FreeBSD.org">
portmgr@FreeBSD.org">
portmgr-secretary@FreeBSD.org">
-projcvs@FreeBSD.org">
-
re@FreeBSD.org">
security-officer@FreeBSD.org">
secteam-secretary@FreeBSD.org">
diff --git a/ja_JP.eucJP/share/xml/teams.ent b/ja_JP.eucJP/share/xml/teams.ent
index afabc3eabe..9a7f4b42c9 100644
--- a/ja_JP.eucJP/share/xml/teams.ent
+++ b/ja_JP.eucJP/share/xml/teams.ent
@@ -1,56 +1,52 @@
admins@FreeBSD.org">
bugmeister@FreeBSD.org">
core@FreeBSD.org">
core-secretary@FreeBSD.org">
cvsadm@FreeBSD.org">
doceng@FreeBSD.org">
donations@FreeBSD.org">
faq@FreeBSD.org">
ftp-master@FreeBSD.org">
mirror-admin@FreeBSD.org">
-ncvs@FreeBSD.org">
-
pcvs@FreeBSD.org">
portmgr@FreeBSD.org">
portmgr-secretary@FreeBSD.org">
ports-secteam@FreeBSD.org">
-projcvs@FreeBSD.org">
-
re@FreeBSD.org">
secteam-secretary@FreeBSD.org">
security-officer@FreeBSD.org">
diff --git a/mn_MN.UTF-8/share/xml/teams.ent b/mn_MN.UTF-8/share/xml/teams.ent
index dc24688e6a..86d31cac06 100644
--- a/mn_MN.UTF-8/share/xml/teams.ent
+++ b/mn_MN.UTF-8/share/xml/teams.ent
@@ -1,60 +1,52 @@
admins@FreeBSD.org">
bugmeister@FreeBSD.org">
core-secretary@FreeBSD.org">
cvsadm@FreeBSD.org">
-cvsup-master@FreeBSD.org">
-
-dcvs@FreeBSD.org">
-
doceng@FreeBSD.org">
donations@FreeBSD.org">
faq@FreeBSD.org">
ftp-master@FreeBSD.org">
mirror-admin@FreeBSD.org">
-ncvs@FreeBSD.org">
-
perforce-admin@FreeBSD.org">
pcvs@FreeBSD.org">
portmgr@FreeBSD.org">
portmgr-secretary@FreeBSD.org">
-projcvs@FreeBSD.org">
-
re@FreeBSD.org">
secteam-secretary@FreeBSD.org">
security-officer@FreeBSD.org">
diff --git a/nl_NL.ISO8859-1/share/xml/teams.ent b/nl_NL.ISO8859-1/share/xml/teams.ent
index 177de0c28e..17a90e78a9 100644
--- a/nl_NL.ISO8859-1/share/xml/teams.ent
+++ b/nl_NL.ISO8859-1/share/xml/teams.ent
@@ -1,55 +1,49 @@
admins@FreeBSD.org">
bugmeister@FreeBSD.org">
core-secretary@FreeBSD.org">
cvsadm@FreeBSD.org">
-cvsup-master@FreeBSD.org">
-
doceng@FreeBSD.org">
donations@FreeBSD.org">
faq@FreeBSD.org">
ftp-master@FreeBSD.org">
mirror-admin@FreeBSD.org">
-ncvs@FreeBSD.org">
-
perforce-admin@FreeBSD.org">
pcvs@FreeBSD.org">
portmgr@FreeBSD.org">
portmgr-secretary@FreeBSD.org">
-projcvs@FreeBSD.org">
-
re@FreeBSD.org">
secteam-secretary@FreeBSD.org">
security-officer@FreeBSD.org">
diff --git a/pl_PL.ISO8859-2/share/xml/teams.ent b/pl_PL.ISO8859-2/share/xml/teams.ent
index 8d401c7a56..be3d2712cf 100644
--- a/pl_PL.ISO8859-2/share/xml/teams.ent
+++ b/pl_PL.ISO8859-2/share/xml/teams.ent
@@ -1,153 +1,127 @@
admins@FreeBSD.org">
admins@FreeBSD.org">
admins@FreeBSD.org">
admins@FreeBSD.org">
admins@FreeBSD.org">
admins@FreeBSD.org">
admins@FreeBSD.org">
core-secretary@FreeBSD.org">
core-secretary@FreeBSD.org">
core-secretary@FreeBSD.org">
core-secretary@FreeBSD.org">
core-secretary@FreeBSD.org">
core-secretary@FreeBSD.org">
core-secretary@FreeBSD.org">
cvsadm@FreeBSD.org">
cvsadm@FreeBSD.org">
cvsadm@FreeBSD.org">
cvsadm@FreeBSD.org">
cvsadm@FreeBSD.org">
cvsadm@FreeBSD.org">
cvsadm@FreeBSD.org">
-cvsup-master@FreeBSD.org">
-cvsup-master@FreeBSD.org">
-cvsup-master@FreeBSD.org">
-cvsup-master@FreeBSD.org">
-cvsup-master@FreeBSD.org">
-cvsup-master@FreeBSD.org">
-cvsup-master@FreeBSD.org">
-
-dcvs@FreeBSD.org">
-dcvs@FreeBSD.org">
-dcvs@FreeBSD.org">
-dcvs@FreeBSD.org">
-dcvs@FreeBSD.org">
-dcvs@FreeBSD.org">
-dcvs@FreeBSD.org">
-
doceng@FreeBSD.org">
doceng@FreeBSD.org">
doceng@FreeBSD.org">
doceng@FreeBSD.org">
doceng@FreeBSD.org">
doceng@FreeBSD.org">
doceng@FreeBSD.org">
donations@FreeBSD.org">
donations@FreeBSD.org">
donations@FreeBSD.org">
donations@FreeBSD.org">
donations@FreeBSD.org">
donations@FreeBSD.org">
donations@FreeBSD.org">
faq@FreeBSD.org">
faq@FreeBSD.org">
faq@FreeBSD.org">
faq@FreeBSD.org">
faq@FreeBSD.org">
faq@FreeBSD.org">
faq@FreeBSD.org">
ftp-master@FreeBSD.org">
ftp-master@FreeBSD.org">
ftp-master@FreeBSD.org">
ftp-master@FreeBSD.org">
ftp-master@FreeBSD.org">
ftp-master@FreeBSD.org">
ftp-master@FreeBSD.org">
mirror-admin@FreeBSD.org">
mirror-admin@FreeBSD.org">
mirror-admin@FreeBSD.org">
mirror-admin@FreeBSD.org">
mirror-admin@FreeBSD.org">
mirror-admin@FreeBSD.org">
mirror-admin@FreeBSD.org">
-ncvs@FreeBSD.org">
-ncvs@FreeBSD.org">
-ncvs@FreeBSD.org">
-ncvs@FreeBSD.org">
-ncvs@FreeBSD.org">
-ncvs@FreeBSD.org">
-ncvs@FreeBSD.org">
-
perforce-admin@FreeBSD.org">
pcvs@FreeBSD.org">
pcvs@FreeBSD.org">
pcvs@FreeBSD.org">
pcvs@FreeBSD.org">
pcvs@FreeBSD.org">
pcvs@FreeBSD.org">
pcvs@FreeBSD.org">
portmgr@FreeBSD.org">
portmgr@FreeBSD.org">
portmgr@FreeBSD.org">
portmgr@FreeBSD.org">
portmgr@FreeBSD.org">
portmgr@FreeBSD.org">
portmgr@FreeBSD.org">
portmgr-secretary@FreeBSD.org">
portmgr-secretary@FreeBSD.org">
portmgr-secretary@FreeBSD.org">
portmgr-secretary@FreeBSD.org">
portmgr-secretary@FreeBSD.org">
portmgr-secretary@FreeBSD.org">
portmgr-secretary@FreeBSD.org">
-projcvs@FreeBSD.org">
-
re@FreeBSD.org">
re@FreeBSD.org">
re@FreeBSD.org">
re@FreeBSD.org">
re@FreeBSD.org">
re@FreeBSD.org">
re@FreeBSD.org">
secteam-secretary@FreeBSD.org">
security-officer@FreeBSD.org">
security-officer@FreeBSD.org">
security-officer@FreeBSD.org">
security-officer@FreeBSD.org">
security-officer@FreeBSD.org">
security-officer@FreeBSD.org">
security-officer@FreeBSD.org">
diff --git a/pt_BR.ISO8859-1/share/xml/teams.ent b/pt_BR.ISO8859-1/share/xml/teams.ent
index 2054fd70ff..2029b44cea 100644
--- a/pt_BR.ISO8859-1/share/xml/teams.ent
+++ b/pt_BR.ISO8859-1/share/xml/teams.ent
@@ -1,79 +1,73 @@
admins@FreeBSD.org">
bugmeister@FreeBSD.org">
core@FreeBSD.org">
core-secretary@FreeBSD.org">
cvsadm@FreeBSD.org">
doceng@FreeBSD.org">
donations@FreeBSD.org">
FAQ
faq@FreeBSD.org">
ftp-master@FreeBSD.org">
mirror-admin@FreeBSD.org">
-ncvs@FreeBSD.org">
-
ports pcvs@FreeBSD.org">
portmgr@FreeBSD.org">
portmgr-secretary@FreeBSD.org">
ports-secteam@FreeBSD.org">
-projcvs@FreeBSD.org">
-
re@FreeBSD.org">
secteam-secretary@FreeBSD.org">
security-officer@FreeBSD.org">
diff --git a/ru_RU.KOI8-R/share/xml/teams.ent b/ru_RU.KOI8-R/share/xml/teams.ent
index ab7cca8fc3..ed286ff047 100644
--- a/ru_RU.KOI8-R/share/xml/teams.ent
+++ b/ru_RU.KOI8-R/share/xml/teams.ent
@@ -1,63 +1,55 @@
admins@FreeBSD.org">
core-secretary@FreeBSD.org">
cvsadm@FreeBSD.org">
-cvsup-master@FreeBSD.org">
-
-dcvs@FreeBSD.org">
-
doceng@FreeBSD.org">
donations@FreeBSD.org">
faq@FreeBSD.org">
ftp-master@FreeBSD.org">
mirror-admin@FreeBSD.org">
-ncvs@FreeBSD.org">
-
perforce-admin@FreeBSD.org">
pcvs@FreeBSD.org">
portmgr@FreeBSD.org">
portmgr-secretary@FreeBSD.org">
-projcvs@FreeBSD.org">
-
re@FreeBSD.org">
secteam-secretary@FreeBSD.org">
security-officer@FreeBSD.org">
www@FreeBSD.org">
diff --git a/zh_CN.UTF-8/share/xml/teams.ent b/zh_CN.UTF-8/share/xml/teams.ent
index ed54729e99..a372a45761 100644
--- a/zh_CN.UTF-8/share/xml/teams.ent
+++ b/zh_CN.UTF-8/share/xml/teams.ent
@@ -1,58 +1,50 @@
admins@FreeBSD.org">
bugmeister@FreeBSD.org">
core-secretary@FreeBSD.org">
cvsadm@FreeBSD.org">
-cvsup-master@FreeBSD.org">
-
-dcvs@FreeBSD.org">
-
doceng@FreeBSD.org">
donations@FreeBSD.org">
faq@FreeBSD.org">
ftp-master@FreeBSD.org">
mirror-admin@FreeBSD.org">
-ncvs@FreeBSD.org">
-
perforce-admin@FreeBSD.org">
pcvs@FreeBSD.org">
portmgr@FreeBSD.org">
portmgr-secretary@FreeBSD.org">
-projcvs@FreeBSD.org">
-
re@FreeBSD.org">
secteam-secretary@FreeBSD.org">
security-officer@FreeBSD.org">