Index: share/pgpkeys/pgpkeys-core.xml
===================================================================
--- share/pgpkeys/pgpkeys-core.xml
+++ share/pgpkeys/pgpkeys-core.xml
@@ -4,19 +4,19 @@
      $FreeBSD$
 -->
 
-    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-gavin">
-      <title>&a.gavin.email;</title>
-      &pgpkey.gavin;
+    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-allanjude">
+      <title>&a.allanjude.email;</title>
+      &pgpkey.allanjude;
     </sect2>
 
-    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-theraven">
-      <title>&a.theraven.email;</title>
-      &pgpkey.theraven;
+    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-bcr">
+      <title>&a.bcr.email;</title>
+      &pgpkey.bcr;
     </sect2>
 
-    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-bapt">
-      <title>&a.bapt.email;</title>
-      &pgpkey.bapt;
+    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-brooks">
+      <title>&a.brooks.email;</title>
+      &pgpkey.brooks;
     </sect2>
 
     <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-emaste">
@@ -24,29 +24,27 @@
       &pgpkey.emaste;
     </sect2>
 
-    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-gnn">
-      <title>&a.gnn.email;</title>
-      &pgpkey.gnn;
-    </sect2>
-
     <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-hrs">
       <title>&a.hrs.email;</title>
       &pgpkey.hrs;
     </sect2>
 
-    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-glebius">
-      <title>&a.glebius.email;</title>
-      &pgpkey.glebius;
+    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-imp">
+      <title>&a.imp.email;</title>
+      &pgpkey.imp;
+    </sect2>
+
+    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-jeff">
+      <title>&a.jeff.email;</title>
+      &pgpkey.jeff;
     </sect2>
 
-    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-peter">
-      <title>&a.peter.email;</title>
-      &pgpkey.peter;
+    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-jhb">
+      <title>&a.jhb.email;</title>
+      &pgpkey.jhb;
     </sect2>
 
-    <!-- XXX: rwatson does not have a PGP key in the repository
-    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-rwatson">
-      <title>&a.rwatson.email;</title>
-      &pgpkey.rwatson;
+    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-seanc">
+      <title>&a.seanc.email;</title>
+      &pgpkey.seanc;
     </sect2>
-    -->
Index: share/xml/authors.ent
===================================================================
--- share/xml/authors.ent
+++ share/xml/authors.ent
@@ -2587,7 +2587,7 @@
 <!ENTITY a.bugmeister '&a.eadler;, &a.gavin;, &a.mva;, &a.koobs;, &a.gonzo;'>
 
 <!-- FreeBSD Core Team -->
-<!ENTITY a.core.members '&a.allanjude;, &a.bapt;, &a.bcr;, &a.benno;, &a.emaste;, &a.gnn;, &a.hrs;, &a.jhb;, &a.kmoore;'>
+<!ENTITY a.core.members '&a.allanjude;, &a.bcr;, &a.brooks;, &a.imp;, &a.hrs;, &a.jeff;, &a.jhb;, &a.kmoore;, @a.seanc;'>
 
 <!-- FreeBSD Doc Engineering Team -->
 <!ENTITY a.doceng.members '&a.gjb;, &a.wblock;, &a.blackend;, &a.gabor;, &a.hrs;'>