diff --git a/share/pgpkeys/simon.key b/share/pgpkeys/simon.key
index c124f6de93..aa6144e683 100644
--- a/share/pgpkeys/simon.key
+++ b/share/pgpkeys/simon.key
@@ -1,57 +1,84 @@
 <!-- $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]
+pub   1024D/27359A51 2003-07-22 [expires: 2006-07-21]
+      Key fingerprint = 912B F341 7E90 2049 05B4  3800 87DA 5C0D 2735 9A51
+uid                  Simon L. Nielsen <simon@nitro.dk>
+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-----
 
 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
-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
+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
+iMcXHQilYkgZ1NasIHebTbLflA==
+=ak+B
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>