diff --git a/share/pgpkeys/simon.key b/share/pgpkeys/simon.key
index 02158ce56f..c124f6de93 100644
--- a/share/pgpkeys/simon.key
+++ b/share/pgpkeys/simon.key
@@ -1,47 +1,57 @@
 <!-- $FreeBSD$ -->
 <!--
 sh addkey.sh simon 27359A51;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
 pub  1024D/27359A51 2003-07-22 Simon L. Nielsen <simon@nitro.dk>
      Key fingerprint = 912B F341 7E90 2049 05B4  3800 87DA 5C0D 2735 9A51
 uid                            Simon L. Nielsen <simon@FreeBSD.org>
 sub  2048g/C11D9097 2003-07-22 [expires: 2006-07-21]
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBD8dLTcRBADMsl+DCPR8Q1jwimfBJcaQv+oSW/gM6H3hTbIdge6atmkmqPCd
 KsD4DO56upi76h6SQSIiJbzKK+FVJGXaIhpBQ09obulObrmd/EnpxJRDwkOh7Yfc
 WoVrkzZu2nJTRVgRzcVN5S91mG8jC080+izpBdSXFEn22gRqNmq5nOTlJwCgzG1i
 iVXRCkOO2AKgS4jvHn8skFMD/0vRit2WUPhcrvhL15JfUOuRpG9A8h4uqBxeK1pu
 rDX93XFeiBmGdi4cLy6D5wyJwkp3biojiHhTeBOQqNrwsa1O1Jg5OVXR6vT4KFcV
 goItGZezSJk+e9BmjhiOgaFiWuTXcvyBGv/hgGNAeW5UY/gA8FH7Mu/FbqGDAsGi
 DJFOBACJIe8UhdiK4QOUrlAk3OoX9UrgCmBQwwxBZKkQyjKgeKTgIQ+jnjiZ3Azj
 eR9Z1H4Y80BGeCoZCe0l0wdRjm4lQVD8gk7wp0Ru5qBhxxV8cQIhyRHzfgt58UDl
 jAnAk4bvfUtHApx+G3bVh5jhvEuGLnZsB2d5XNqZLMEMvcCBdrQhU2ltb24gTC4g
 TmllbHNlbiA8c2ltb25Abml0cm8uZGs+iGQEExECACQFCQWjmoAGCwkIBwMCAxUC
 AwMWAgECHgECF4AFAj8dMhkCGQEACgkQh9pcDSc1mlH6LACfRWO9Uv2sLEfRk0lf
 DbBuo6BZl2MAoJtKCZRBW5GOdLUvUWLE3p+YYxn+iEwEExECAAwFAj8dMioFgwWj
 lY0ACgkQ8kocFXgPTRwyMwCgxHTbtWznRLOuvDtUGKD//6IVGt8AoIV/yqC4/eMc
-To/U23AXnVMyUlRHtCRTaW1vbiBMLiBOaWVsc2VuIDxzaW1vbkBGcmVlQlNELm9y
-Zz6IZAQTEQIAJAUCPx0tagIbAwUJBaOagAYLCQgHAwIDFQIDAxYCAQIeAQIXgAAK
-CRCH2lwNJzWaUZARAJ0d0KQu1jQh7j4tOs/4jnJXPe4D+gCfQVlNR6jR9cLwVB2x
-WDVzWqPG1WmITAQTEQIADAUCPx0yKgWDBaOVjQAKCRDyShwVeA9NHB1sAKCodM0f
-LdSyHN6pe+nAZaX1upC8TgCeKTtcl7BvRXeznP+JGUMUT0Qb6CW5Ag0EPx0tQBAI
-ALZ59V+SBIYMA6pk5gzPAxfvs9RZnLCAktE+BlssdYfsed+mu3VbcXmrtKMbb1xB
-ADW/Jr9JsUQIC2McVCB0ZGtiZDPxIvcLaGQAVUsN6Q/FPrT7fHuN4r+DKPB4BXJ0
-2CK/qYZLrid3XsrYVc/7W/InaTz6skrIwfykggO4e5JNNd2hraahihQWurHJEQq0
-4leB+gMg4KBGKD5dc+M/Orw5Z9jhsT/+GkAQlwPsBVvNXks9RnLldkL5N7CDw7jL
-00RBJnASNPJp44zKPP4mMtFNOoYmFQVQGC7Qt+yHalGhdFR2qnsshz2Tm3BuNvI0
-vbSRMxJjl3W88pCwpgZvOEMAAwYH/RcMNwpjDEhXoyPBwXIGRPerP1j7ZLMeGW4N
-cakUorZ5Qt/m2H5n0WAjVQaoKs+l+WYTpyGcg8ilFcBQjVJM9g9oWaGi0X9VL2XE
-JXtWu8F+epXRzfZSoj3UFk0iT0ut0ckrjaJKvkMdvrWfTlu2l1TPbG/UjlXoY6uJ
-Xgo85CwkaSgoV7HEUyr7CI2LLbnwGNw0Ugx6wU+lZoPqUylRCf1wwEMokyo/qHx4
-dlsELvQlfG2sOrX5ogwQcU05FwyWK8zZC5XynrMEXYt1aLlgOrgO8RTac47KYw2z
-SSRvRPANpgRZ+BGJtPvWl5gQRV+vohxgW2flWRNiqKLJ89Kmm0SITAQYEQIADAUC
-Px0tQAUJBaOagAAKCRCH2lwNJzWaUazaAJ9koP8M9azeT7FzlMv3QTihNQfn3QCf
-RIjHFx0IpWJIGdTWrCB3m02y35Q=
-=TWiy
+To/U23AXnVMyUlRHiEwEExECAAwFAkGErGYFgwM8G1EACgkQjDKM/xYG25WiDwCe
+NtXP7sZIUS/T1Xq81PIyR7WrEMcAnjKLHiU1f1cKyWg61jP2wbYGDxebiEwEExEC
+AAwFAkGErSMFgwM8GpQACgkQv0vQ5gSduHmCrQCeNnRb9kxPhC91kWwEfcgLzwtY
+siwAn3yoyfKhnagfSMtXdBhUYaNarcm2iEwEExECAAwFAkGEraMFgwM8GhQACgkQ
+FdaIBMps37I70ACgmJK7lXP7R/LaOcKGXrs64+NAaEAAn291pRDMvdWMnBhQQ0/Y
+l75vwS3ttCRTaW1vbiBMLiBOaWVsc2VuIDxzaW1vbkBGcmVlQlNELm9yZz6IZAQT
+EQIAJAUCPx0tagIbAwUJBaOagAYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCH2lwN
+JzWaUZARAJ0d0KQu1jQh7j4tOs/4jnJXPe4D+gCfQVlNR6jR9cLwVB2xWDVzWqPG
+1WmITAQTEQIADAUCPx0yKgWDBaOVjQAKCRDyShwVeA9NHB1sAKCodM0fLdSyHN6p
+e+nAZaX1upC8TgCeKTtcl7BvRXeznP+JGUMUT0Qb6CWITAQTEQIADAUCQYSsZgWD
+AzwbUQAKCRCMMoz/FgbblW0AAKCPtHL9IBSDKonRRDr7rOTqk7W81QCfbPd+3d00
+MualqLRXqFALtMW3X8iITAQTEQIADAUCQYStIwWDAzwalAAKCRC/S9DmBJ24ebpr
+AJ0XAj0s7Xem7Xt8s9Q+A6d8y945sgCgzwSx6PJHcXSl1QZO8FNLDdTfKpSITAQT
+EQIADAUCQYStowWDAzwaFAAKCRAV1ogEymzfsoN/AKCeqtx8fPvbNE85WBo60O5/
+kqPVfwCcD0hwNYrDxZJ6jt286KbjN2jmMQi5Ag0EPx0tQBAIALZ59V+SBIYMA6pk
+5gzPAxfvs9RZnLCAktE+BlssdYfsed+mu3VbcXmrtKMbb1xBADW/Jr9JsUQIC2Mc
+VCB0ZGtiZDPxIvcLaGQAVUsN6Q/FPrT7fHuN4r+DKPB4BXJ02CK/qYZLrid3XsrY
+Vc/7W/InaTz6skrIwfykggO4e5JNNd2hraahihQWurHJEQq04leB+gMg4KBGKD5d
+c+M/Orw5Z9jhsT/+GkAQlwPsBVvNXks9RnLldkL5N7CDw7jL00RBJnASNPJp44zK
+PP4mMtFNOoYmFQVQGC7Qt+yHalGhdFR2qnsshz2Tm3BuNvI0vbSRMxJjl3W88pCw
+pgZvOEMAAwYH/RcMNwpjDEhXoyPBwXIGRPerP1j7ZLMeGW4NcakUorZ5Qt/m2H5n
+0WAjVQaoKs+l+WYTpyGcg8ilFcBQjVJM9g9oWaGi0X9VL2XEJXtWu8F+epXRzfZS
+oj3UFk0iT0ut0ckrjaJKvkMdvrWfTlu2l1TPbG/UjlXoY6uJXgo85CwkaSgoV7HE
+Uyr7CI2LLbnwGNw0Ugx6wU+lZoPqUylRCf1wwEMokyo/qHx4dlsELvQlfG2sOrX5
+ogwQcU05FwyWK8zZC5XynrMEXYt1aLlgOrgO8RTac47KYw2zSSRvRPANpgRZ+BGJ
+tPvWl5gQRV+vohxgW2flWRNiqKLJ89Kmm0SITAQYEQIADAUCPx0tQAUJBaOagAAK
+CRCH2lwNJzWaUazaAJ9koP8M9azeT7FzlMv3QTihNQfn3QCfRIjHFx0IpWJIGdTW
+rCB3m02y35Q=
+=9o1L
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>