Index: head/share/pgpkeys/krion.key
===================================================================
--- head/share/pgpkeys/krion.key	(revision 53138)
+++ head/share/pgpkeys/krion.key	(revision 53139)
@@ -1,52 +1,96 @@
 <!-- $FreeBSD$ -->
 <!--
 sh addkey.sh krion 0F223DFCB302CA45 ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   rsa2048/0F223DFCB302CA45 2017-01-24 [SC] [expires: 2019-01-24]
+pub   rsa2048/0F223DFCB302CA45 2017-01-24 [SC] [expires: 2022-09-08]
       Key fingerprint = 2421 D116 1100 42E8 CA9E  2D69 0F22 3DFC B302 CA45
-uid                            Kirill Ponomarev <krion@FreeBSD.org>
 uid                            Kirill Ponomarev <kp@krion.cc>
-sub   rsa2048/689A26385A12AC21 2017-01-24 [E] [expires: 2019-01-24]
+uid                            Kirill Ponomarev <krion@FreeBSD.org>
+sub   rsa2048/689A26385A12AC21 2017-01-24 [E] [expires: 2022-09-08]
 
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 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
-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
-=UBAw
+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
+VHk7OwIUP+dloMB/c4OUjB6B4ose/AO8kfkY3w==
+=KQTp
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>