diff --git a/share/pgpkeys/simon.key b/share/pgpkeys/simon.key
index d2a9899f1e..02158ce56f 100644
--- a/share/pgpkeys/simon.key
+++ b/share/pgpkeys/simon.key
@@ -1,51 +1,47 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh simon 780F4D1C;
+sh addkey.sh simon 27359A51;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub  1024D/780F4D1C 2001-06-09 Simon L. Nielsen <simon@nitro.dk>
-     Key fingerprint = F3DA F249 97D3 A94F A323  EC5E F24A 1C15 780F 4D1C
-uid                            Simon L. Nielsen <simonln@diku.dk>
-uid                            Simon L. Nielsen <simonln@spamcop.net>
+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  1024g/8E408C32 2001-06-09 [expires: 2004-12-31]
+sub  2048g/C11D9097 2003-07-22 [expires: 2006-07-21]
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-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
-MACbBOC2nrMUNMyV/g4EIndT8Ev1Woo=
-=AglW
+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
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>