diff --git a/share/pgpkeys/pkelsey.key b/share/pgpkeys/pkelsey.key
index d549e7aa06..8fbdf050c7 100644
--- a/share/pgpkeys/pkelsey.key
+++ b/share/pgpkeys/pkelsey.key
@@ -1,51 +1,78 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh pkelsey 044ADF500A4B194E ;
+sh addkey.sh pkelsey ADE1EBB059F1D1CE ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   2048R/044ADF500A4B194E 2014-05-30 [expires: 2017-05-29]
-      Key fingerprint = 4082 2A15 231C 09EC D86E  63C2 044A DF50 0A4B 194E
-uid                          Patrick J Kelsey <pkelsey@freebsd.org>
-uid                          Patrick J Kelsey <kelsey@ieee.org>
-sub   2048R/CB7433052A5B26E5 2014-05-30 [expires: 2017-05-29]
+pub   rsa4096/ADE1EBB059F1D1CE 2017-06-05 [expires: 2020-06-04]
+      Key fingerprint = EF68 C6CC 60E6 6C5A 7896  E925 ADE1 EBB0 59F1 D1CE
+uid                            Patrick J Kelsey <kelsey@ieee.org>
+uid                            Patrick J Kelsey <pkelsey@freebsd.org>
+sub   rsa4096/E880A4E060DE2D08 2017-06-05 [expires: 2020-06-04]
 
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-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
-ACsIIpVHmMhmqZAaJ5rRdtaoKNo=
-=tZis
+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
+He6RaA==
+=GqoG
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>