diff --git a/share/pgpkeys/pgpkeys-core.sgml b/share/pgpkeys/pgpkeys-core.sgml
index ad64f70aae..bb355324dd 100644
--- a/share/pgpkeys/pgpkeys-core.sgml
+++ b/share/pgpkeys/pgpkeys-core.sgml
@@ -4,6 +4,16 @@
      $FreeBSD$
 -->
 
+    <sect2 id="pgpkey-core-tabthorpe">
+      <title>&a.tabthorpe;</title>
+      &pgpkey.tabthorpe;
+    </sect2>
+
+    <sect2 id="pgpkey-core-gavin">
+      <title>&a.gavin;</title>
+      &pgpkey.gavin;
+    </sect2>
+
     <sect2 id="pgpkey-core-jhb">
       <title>&a.jhb;</title>
       &pgpkey.jhb;
@@ -14,32 +24,30 @@
       &pgpkey.kib;
     </sect2>
 
-    <sect2 id="pgpkey-core-wilko">
-      <title>&a.wilko;</title>
-      &pgpkey.wilko;
+    <sect2 id="pgpkey-core-theraven">
+      <title>&a.theraven;</title>
+      &pgpkey.theraven;
     </sect2>
 
-    <sect2 id="pgpkey-core-brooks">
-      <title>&a.brooks;</title>
-      &pgpkey.brooks;
-    </sect2>
-
-    <sect2 id="pgpkey-core-imp">
-      <title>&a.imp;</title>
-      &pgpkey.imp;
-    </sect2>
-
-    <sect2 id="pgpkey-core-pav">
-      <title>&a.pav;</title>
-      &pgpkey.pav;
-    </sect2>
-
-    <sect2 id="pgpkey-core-cperciva">
-      <title>&a.cperciva;</title>
-      &pgpkey.cperciva;
+<!--
+attilio has no PGP key in the handbook yet
+    <sect2 id="pgpkey-core-attilio">
+      <title>&a.attilio;</title>
+      &pgpkey.attilio;
     </sect2>
+-->
 
     <sect2 id="pgpkey-core-hrs">
       <title>&a.hrs;</title>
       &pgpkey.hrs;
     </sect2>
+
+    <sect2 id="pgpkey-core-peter">
+      <title>&a.peter;</title>
+      &pgpkey.peter;
+    </sect2>
+
+    <sect2 id="pgpkey-core-miwi">
+      <title>&a.miwi;</title>
+      &pgpkey.miwi;
+    </sect2>