diff --git a/share/pgpkeys/ceri.key b/share/pgpkeys/ceri.key
index d70a8b9bdd..87df98395c 100644
--- a/share/pgpkeys/ceri.key
+++ b/share/pgpkeys/ceri.key
@@ -1,66 +1,119 @@
 <!-- $FreeBSD$ -->
 <!--
 sh addkey.sh ceri 34B7245F;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
 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>
 sub   1024g/0C482CBC 2002-03-08
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 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/WFsWogHehM2ZDDLQCgkcxqJHpqLQgQ2VyaSBEYXZp
 ZXMgPGNlcmlAc3VibW9ua2V5Lm5ldD6IWgQTEQIAGgULBwoDBAMVAwIDFgIBAheA
 AhkBBQJDWLjtAAoJEKHH3ME0tyRfGVoAoJ8MM1InI2UNV8psbz7ohl2H3IIiAKCl
 fQwvDq+57wOGwww9EHjDnrQbjYhGBBMRAgAGBQJDv9fmAAoJEJnvMgrELySdmKIA
 oKLyqXKtsSbNFOdz9LFOpd7EqmxOAJ0XgLeoxhXy0X6sWvuOTuD67Oel8YhGBBMR
 AgAGBQJDv9gIAAoJEBCXnKrAf8AFNLIAnREnzXhLjkUFyLOMwEsaNl3RZ0KiAJ9S
 p8RSGaditiGbCXA3F068K1l6wohXBBMRAgAXBQI8lfbaBQsHCgMEAxUDAgMWAgEC
 F4AACgkQocfcwTS3JF8B+QCglZ+/NH9oWiL7+EyJ04KUFF6NbtEAoLWBDEfP8E0E
 X/KdcO/0elAnMbRaiFoEExECABoFCwcKAwQDFQMCAxYCAQIXgAUCQfDJJQIZAQAK
 CRChx9zBNLckX8waAJ44zndecthUv9HmKavugJaUxWakBwCgtkSI0X6VOe65y1lo
-PAcT/i2Q2m+0HkNlcmkgRGF2aWVzIDxjZXJpQEZyZWVCU0Qub3JnPohXBBMRAgAX
-BQsHCgMEAxUDAgMWAgECF4AFAkNYuPQACgkQocfcwTS3JF+MTACgmn9b8RwjJSmJ
-NifqvzkXl+CTOdYAn25K6N9kCj5jjtZr6pKWH3P55b5TiEYEExECAAYFAkO/1+sA
-CgkQme8yCsQvJJ3vLQCgniBQmtHE8olTigd91Uv51xA6hMgAn13LFKvcJEtRUay3
-zK0JR+8Sj2qdiEYEExECAAYFAkO/2A4ACgkQEJecqsB/wAX/YwCdFIGE9q1n6qv9
-zl06QLA1hwXmJlQAn3SEyG1CYaGae3yFMOdIh5FCqxyRiFcEExECABcFAjyV9sMF
-CwcKAwQDFQMCAxYCAQIXgAAKCRChx9zBNLckXyVAAJwMhZvAWiLLPCy0Jf3Iuh/F
-ehfw6ACfT4LV0BVT5IseTxrd5dKKqp9losm0IENlcmkgRGF2aWVzIDxkYXZpZXNj
-bTVAY2YuYWMudWs+iGAEExECACAFAkNYuRoCGyMGCwkIBwMCBBUCCAMEFgIDAQIe
-AQIXgAAKCRChx9zBNLckX31FAKC6gO5VL2KU9Vh8rc1pOfi2ipJH6wCeKR6IVcfe
-ECUGVpeztxhfdeWcTvGIRgQTEQIABgUCQ7/X6wAKCRCZ7zIKxC8kneJjAKCPw2VI
-xxa0CKymp80Cw57MtLHJMwCgl1EH5Qv6Si9H4pjfacnRc8KxHCaIRgQTEQIABgUC
-Q7/YDgAKCRAQl5yqwH/ABVxbAJ4h4/60PjUD7J06iImyadephKig9gCff7O9KnCz
-cd9wg+u1T2uDY5sNXk20JENlcmkgRGF2aWVzIDxzZXRhbnRhZUBzdWJtb25rZXku
-bmV0PohZBDARAgAZBQJDSkonEh0gTm8gbG9uZ2VyIGluIHVzZQAKCRChx9zBNLck
-X5m8AJoDPEcZVTbidtcPrzTs/VUU4sWFlACfaJ9Ku1O69w6C65R0ewBEWQJzbE+I
-VwQTEQIAFwUCPIj2awULBwoDBAMVAwIDFgIBAheAAAoJEKHH3ME0tyRfSgwAoKnF
-y8fpbLbo1CCee32H1+w6Wk5WAKCa+QqYHjX1SuvTZWUi8NLbM8Xet7QnQ2VyaSBE
-YXZpZXMgKFdvcmspIDxkYXZpZXNjbTVAY2YuYWMudWs+iGAEExECACAFAkM3OEwC
-GyMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRChx9zBNLckX20dAJwNMdxTXDe0
-GRQjI8lCKvvElPh/JQCgxSIykit83Vt8JFQbT5l7oUpund+IRgQTEQIABgUCQ7/X
-6wAKCRCZ7zIKxC8knaF7AJwJn0d6JkC1YlOIyXARvZy+x29BrwCfTqRHJcdBirZ1
-4Nqjte0nDTg7O6yIRgQTEQIABgUCQ7/YDgAKCRAQl5yqwH/ABcOcAKDD9e+nDrGc
-0IQGSWBrqpp9hjMhOgCgrGOW1nfM4gOk57pnmzaPJ6nXyIa5AQ0EPIj2cxAEAIKx
-dMRJsJsRMFq4fPmWwsY9wi7dbHGbqrTd67iyyK8w03t5iGTGgcrhsTSIgyXyIVSN
-4jO8ZcGt08huGGuYUnqAh9DSXBV7FNmSkUNDKfzgJj5NvNZc052QBmyr6FC6DDXJ
-UqfgU7pwbEp0Hio1Jp57/tNMFZeW6I5uXBTcHd9LAAMGA/9HApzNt52P7btxgu+6
-TaOkOzuGaEvYEuFr0eadPI8VgOFb3uzuAeMefediOKRayxNi5UaWWyfYNdFRU55g
-kzML0poUfBEz6IuA84pM2ikSa+8MJWLxl5S/Kq6jAfSXeyKAfIX689pCmHdnEe87
-lsjp5qq198sxqC2XSuVIoPiSF4hGBBgRAgAGBQI8iPZzAAoJEKHH3ME0tyRfHiYA
-n2QTnfzvyQxjaMeInwSUTMRZsk6xAJ9K0owgeA487TkIluwlers5hf3BIw==
-=EJ4P
+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
+CJbsJXq7OYX9wSM=
+=gvRl
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>