Index: en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml
===================================================================
--- en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml
+++ en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml
@@ -4,14 +4,27 @@
 xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
 
   <listitem>
-    <para>&a.tabthorpe.email; (2012 - 2014)</para>
+    <para>&a.bapt.email; (2016 - 2018)</para>
+  </listitem>
+
+  <listitem>
+    <para>&a.benno.email; (2016 - 2018)</para>
   </listitem>
 
   <listitem>
-    <para>&a.jhb.email; (2002 - 2006, 2010 - 2014)</para>
+    <para>&a.emaste.email; (2016 - 2018)</para>
   </listitem>
 
   <listitem>
+    <para>&a.tabthorpe.email; (2012 - 2014)</para>
+  </listitem>
+
+<!--  <listitem>
+    <para>&a.jhb.email; (2002 - 2006, 2010 - 2014, 2016-2018)</para>
+  </listitem>
+-->
+
+  <listitem>
     <para>&a.kib.email; (2010 - 2014)</para>
   </listitem>
 
@@ -27,9 +40,10 @@
     <para>&a.wilko.email; (2006 - 2012)</para>
   </listitem>
 
-  <listitem>
+<!--  <listitem>
     <para>&a.brooks.email; (2006 - 2012)</para>
   </listitem>
+-->
 
   <listitem>
     <para>&a.pav.email; (2010 - 2012)</para>
@@ -39,11 +53,9 @@
     <para>&a.cperciva.email; (2010 - 2012)</para>
   </listitem>
 
-  <!--
   <listitem>
     <para>&a.rwatson.email; (2000 - 2012)</para>
   </listitem>
-  -->
 
   <listitem>
     <para>&a.keramida.email; (2006 - 2010)</para>
@@ -53,11 +65,9 @@
     <para>&a.kris.email; (2008 - 2010)</para>
   </listitem>
 
-  <!--
   <listitem>
-    <para>&a.gnn.email; (2006 - 2010)</para>
+    <para>&a.gnn.email; (2006 - 2010, 2016 - 2018)</para>
   </listitem>
-  -->
 
   <listitem>
     <para>&a.murray.email; (2002 - 2010)</para>
@@ -67,15 +77,15 @@
     <para>&a.wes.email; (2002 - 2008)</para>
   </listitem>
 
-  <!--
   <listitem>
     <para>&a.peter.email; (1995 - 2006, 2008 - 2010)</para>
   </listitem>
-  -->
 
+ <!--
   <listitem>
     <para>&a.imp.email; (2000 - 2008, 2010 - 2012)</para>
   </listitem>
+-->
 
   <listitem>
     <para>&a.markm.email; (2002 - 2006)</para>
@@ -85,11 +95,9 @@
     <para>&a.kuriyama.email; (2002 - 2006)</para>
   </listitem>
 
-  <!--
   <listitem>
     <para>&a.jhb.email; (2002 - 2006)</para>
   </listitem>
-  -->
 
   <listitem>
     <para>&a.scottl.email; (2004 - 2005)</para>
Index: en_US.ISO8859-1/htdocs/administration.xml
===================================================================
--- en_US.ISO8859-1/htdocs/administration.xml
+++ en_US.ISO8859-1/htdocs/administration.xml
@@ -90,14 +90,14 @@
 
   <ul>
     <li>&a.allanjude.email; (Clusteradm Liaison)</li>
-    <li>&a.bapt.email; (Portmgr and CI-team Liaison)</li>
-    <li>&a.bcr.email;</li>
-    <li>&a.benno.email; (Code-of-Conduct Committee and Security Team Liaison)</li>
-    <li>&a.emaste.email;</li>
-    <li>&a.gnn.email;</li>
-    <li>&a.hrs.email; (Doceng and Release Engineering Team Liaison)</li>
-    <li>&a.jhb.email; (Bugmeister Liaison)</li>
+    <li>&a.bcr.email; (Foundation Liaison)</li>
+    <li>&a.brooks.email; (Security Team Liaison)</li>
+    <li>&a.hrs.email; (Doceng Team Liaison)</li>
+    <li>&a.imp.email; (Code-of-Conduct Committee Liaison)</li>
+    <li>&a.jeff.email;</li>
+    <li>&a.jhb.email; (Bugmeister and Release Engineering Team Liaison)</li>
     <li>&a.kmoore.email;</li>
+    <li>&a.seanc.email; (CI and Portmgr Team Liaison)</li>
   </ul>
 
   <h3><a name="t-doceng">FreeBSD Documentation Engineering Team</a>
@@ -131,14 +131,14 @@
     Team in greater detail.</p>
 
   <ul>
-    <li>&a.mat.email; (Cluster Administration Team Liaison)</li>
+    <li>&a.adamw.email;</li>
     <li>&a.antoine.email;</li>
     <li>&a.bapt.email; (Core Team Liaison)</li>
     <li>&a.bdrewery.email; (Release Engineering Team Liaison)</li>
     <li>&a.feld.email;</li>
+    <li>&a.mat.email; (Cluster Administration Team Liaison)</li>
     <li>&a.rene.email; (Secretary)</li>
     <li>&a.swills.email;</li>
-    <li>&a.adamw.email;</li>
   </ul>
 
   <hr/>
@@ -265,16 +265,15 @@
     &lt;<a href="mailto:core-secretary@FreeBSD.org">core-secretary@FreeBSD.org</a>&gt;</h3>
 
   <p>The &os; Core Team Secretary is a non-voting member of the Core Team,
-    responsible for documenting the work done by core, keeping track of the
-    core agenda, direct contact with non-core members sending mail to core
-    and to be an the interface to the admin team for
-    committer/account approval.  The Core Team Secretary is also responsible
-    for writing and sending out monthly status reports to the &os;
-    Developer community, containing a summary of core's latest decisions and
-    actions.</p>
+    responsible for documenting the work done by core, keeping track of the core
+    agenda, contacting non-core members on behalf of core, sending mail to core,
+    and interfacing with the admin team for committer/account approval.  The Core
+    Team Secretary is also responsible for writing and sending out monthly status
+    reports to the &os; Developer community, containing a summary of core's latest
+    decisions and actions.</p>
 
   <ul>
-    <li>&a.matthew.email;</li>
+    <li>&a.jrm.email;</li>
   </ul>
 
   <h3><a name="t-portmgr-secretary">Port Management Team Secretary</a>