Index: head/share/pgpkeys/adamw.key
===================================================================
--- head/share/pgpkeys/adamw.key	(revision 50289)
+++ head/share/pgpkeys/adamw.key	(revision 50290)
@@ -1,51 +1,79 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh adamw 1CCD0A5830E59D2B ;
+sh addkey.sh adamw FA0ABE2C04C8317C ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   2048R/1CCD0A5830E59D2B 2014-02-03 [expires: 2017-02-02]
-      Key fingerprint = F95F 60DB 115C EA59 2FED  E1FB 1CCD 0A58 30E5 9D2B
-uid                          Adam Weinberger <adamw@FreeBSD.org>
-uid                          Adam Weinberger <adamw@adamw.org>
-sub   2048R/92C1C8A42BDE2CCE 2014-02-03 [expires: 2017-02-02]
+pub   rsa4096/FA0ABE2C04C8317C 2017-05-28 [SC] [expires: 2020-05-27]
+      Key fingerprint = E0F0 7F3B 42CD 4B77 23B3  C7DE FA0A BE2C 04C8 317C
+uid                            Adam Weinberger <adamw@FreeBSD.org>
+uid                            Adam Weinberger <adamw@adamw.org>
+sub   rsa4096/B12E9E74211E229D 2017-05-28 [E] [expires: 2020-05-27]
 
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-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
-sBubp36SuO2WuMa1ke1Ygw==
-=QzLu
+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
+xxqYAGM66+xMeEJpOQHPAyuQB6ch
+=hbuu
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>