diff --git a/share/pgpkeys/ceri.key b/share/pgpkeys/ceri.key
index 42c7a771aa..69e6ceca2f 100644
--- a/share/pgpkeys/ceri.key
+++ b/share/pgpkeys/ceri.key
@@ -1,42 +1,67 @@
 <!-- $FreeBSD$ -->
 <!--
 sh addkey.sh ceri 34B7245F;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub  1024D/34B7245F 2002-03-08 Ceri Davies <ceri@submonkey.net>
-     Key fingerprint = 9C88 EB05 A908 1058 A4AE  9959 A1C7 DCC1 34B7 245F
-uid                            Ceri Davies <setantae@submonkey.net>
-uid                            Ceri Davies <ceri@FreeBSD.org>
-sub  1024g/0C482CBC 2002-03-08
+pub   1024D/34B7245F 2002-03-08
+      Key fingerprint = 9C88 EB05 A908 1058 A4AE  9959 A1C7 DCC1 34B7 245F
+uid                  Ceri Davies <ceri@submonkey.net>
+uid                  Ceri Davies <ceri@FreeBSD.org>
+uid                  Ceri Davies <daviescm5@cf.ac.uk>
+sub   1024g/0C482CBC 2002-03-08
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.0.7 (FreeBSD)
 
 mQGiBDyI9msRBAD3ChWTrd6eyVBO/p8CKWvVwR2nHBlwNzjUwLhXK12wNXpzIOkD
 ZoRm+eh23B06dTISQhfCJEdC6nhb2Tu/q7ZdTVZ8xsuEQh0AYgxDfaKbDkOQ5UXb
 CbymX6LEarS7yt/WNTZYZ42wKfaaznW7k9/pf6BiqkSOeXyYAhqgHty7KwCgyqN8
 2In5R/b/DDAN51vGrFWcD5UEAJwcZ6zCpwZKKRNbWziKGC+avf2AAkc94uwU+qzn
 3oea4Fp/NCSwoLghisKtMM9PDWk8Kkt0HUcv5n88sD3HfXzYQDFbx8VxLXqdaIyA
 NYtY9JJ6ErX9FlUaUM0qwbxI5fahKzmENFPn/1322Tq7UpuVcLOdqsHZG3xMAv4s
 ynzmBADBf1z7t9xBlbbLOZ90KxH9+TAbfap62fryCmr+a0cQVsynfPMfM2vdgUi1
 UP26yE5IqpIliNTdxtXCei5sWsWkA/N4sEMREXzsNjiN/IAerU9aw7MIW/On9oC7
-vNGBiVZ0sX0mMnG+m39wPP/WFsWogHehM2ZDDLQCgkcxqJHpqLQkQ2VyaSBEYXZp
-ZXMgPHNldGFudGFlQHN1Ym1vbmtleS5uZXQ+iFcEExECABcFAjyI9msFCwcKAwQD
-FQMCAxYCAQIXgAAKCRChx9zBNLckX0oMAKCpxcvH6Wy26NQgnnt9h9fsOlpOVgCg
-mvkKmB419Urr02VlIvDS2zPF3re0HkNlcmkgRGF2aWVzIDxjZXJpQEZyZWVCU0Qu
-b3JnPohXBBMRAgAXBQI8lfbDBQsHCgMEAxUDAgMWAgECF4AACgkQocfcwTS3JF8l
-QACcDIWbwFoiyzwstCX9yLofxXoX8OgAn0+C1dAVU+SLHk8a3eXSiqqfZaLJtCBD
-ZXJpIERhdmllcyA8Y2VyaUBzdWJtb25rZXkubmV0PohXBBMRAgAXBQI8lfbaBQsH
-CgMEAxUDAgMWAgECF4AACgkQocfcwTS3JF8B+QCglZ+/NH9oWiL7+EyJ04KUFF6N
-btEAoLWBDEfP8E0EX/KdcO/0elAnMbRauQENBDyI9nMQBACCsXTESbCbETBauHz5
-lsLGPcIu3Wxxm6q03eu4ssivMNN7eYhkxoHK4bE0iIMl8iFUjeIzvGXBrdPIbhhr
-mFJ6gIfQ0lwVexTZkpFDQyn84CY+TbzWXNOdkAZsq+hQugw1yVKn4FO6cGxKdB4q
-NSaee/7TTBWXluiOblwU3B3fSwADBgP/RwKczbedj+27cYLvuk2jpDs7hmhL2BLh
-a9HmnTyPFYDhW97s7gHjHn3nYjikWssTYuVGllsn2DXRUVOeYJMzC9KaFHwRM+iL
-gPOKTNopEmvvDCVi8ZeUvyquowH0l3sigHyF+vPaQph3ZxHvO5bI6eaqtffLMagt
-l0rlSKD4kheIRgQYEQIABgUCPIj2cwAKCRChx9zBNLckXx4mAJ9kE53878kMY2jH
-iJ8ElEzEWbJOsQCfStKMIHgOPO05CJbsJXq7OYX9wSM=
-=aCeK
+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
+=EJ4P
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>