diff --git a/en_US.ISO8859-1/articles/contributors/article.sgml b/en_US.ISO8859-1/articles/contributors/article.sgml
index 205fa7a199..641d01682b 100644
--- a/en_US.ISO8859-1/articles/contributors/article.sgml
+++ b/en_US.ISO8859-1/articles/contributors/article.sgml
@@ -1685,7 +1685,12 @@
 	<term>CVSup Mirror Site Coordinator</term>
 
 	<listitem>
-	  <para>&a.kuriyama;</para>
+	  <para>&a.cvsup-master;</para>
+
+	  <para>which includes:</para>
+
+	  <para>&a.kuriyama; (responsible),</para>
+	  <para>&a.jdp; (advisor)</para>
 	</listitem>
       </varlistentry>
 
diff --git a/en_US.ISO8859-1/articles/hubs/article.sgml b/en_US.ISO8859-1/articles/hubs/article.sgml
index cf19b6d812..3cabf52a1b 100644
--- a/en_US.ISO8859-1/articles/hubs/article.sgml
+++ b/en_US.ISO8859-1/articles/hubs/article.sgml
@@ -3,6 +3,8 @@
 %man;
 <!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
 %authors;
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+%teams;
 <!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
 %mailing-lists;
 <!ENTITY % not.published "IGNORE">
@@ -879,7 +881,7 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
             See <xref linkend="mirror-cvs-cvsup"> for details.
           </para>
           <para>
-            To get access, you need to contact &a.jdp;.
+            To get access, you need to contact &a.cvsup-master;.
             Make sure you read
             <ulink url="http://people.FreeBSD.org/~jdp/cvsup-access/">FreeBSD CVSup Access Policy</ulink>
             first!
diff --git a/en_US.ISO8859-1/share/sgml/teams.ent b/en_US.ISO8859-1/share/sgml/teams.ent
index 8de8df91c4..302c9ee6a7 100644
--- a/en_US.ISO8859-1/share/sgml/teams.ent
+++ b/en_US.ISO8859-1/share/sgml/teams.ent
@@ -19,6 +19,8 @@
 
 <!ENTITY a.cvs "CVS Repository Meisters <email>cvs@FreeBSD.org</email>">
 
+<!ENTITY a.cvsup-master "CVSup Mirror Site Coordinator <email>cvsup-master@FreeBSD.org</email>">
+
 <!ENTITY a.doceng "Documentation Engineering Team <email>doceng@FreeBSD.org</email>">
 
 <!ENTITY a.faq "FAQ Maintainer <email>faq@FreeBSD.org</email>">