Index: head/share/pgpkeys/andrew.key
===================================================================
--- head/share/pgpkeys/andrew.key	(revision 51422)
+++ head/share/pgpkeys/andrew.key	(revision 51423)
@@ -1,50 +1,92 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh andrew 31B31614;
+sh addkey.sh andrew C8347170347FF19F ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   2048R/31B31614 2010-07-01
-      Key fingerprint = 08AC 2C57 F14F FDD1 2232  B5CD AA16 EFB8 31B3 1614
-uid                  Andrew Turner <andrew@freebsd.org>
-uid                  Andrew Turner <andrew@fubar.geek.nz>
-sub   2048R/9ACBF138 2010-07-01
+pub   rsa4096/C8347170347FF19F 2018-02-14 [SC] [expires: 2022-02-14]
+      Key fingerprint = 251E 4651 0A91 D459 6565  F149 C834 7170 347F F19F
+uid                            Andrew Turner <andrew@freebsd.org>
+uid                            Andrew Turner <andrew@fubar.geek.nz>
+sub   rsa4096/9251B5093178715D 2018-02-14 [E] [expires: 2022-02-14]
+
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-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
-BuY=
-=WLSs
+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
+Yw==
+=8XJn
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>