diff --git a/share/pgpkeys/krion.key b/share/pgpkeys/krion.key
index 20b21b233f..974ba9daea 100644
--- a/share/pgpkeys/krion.key
+++ b/share/pgpkeys/krion.key
@@ -1,63 +1,108 @@
 <!-- $FreeBSD$ -->
 <!--
 sh addkey.sh krion AEB426E5;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
 pub  1024D/AEB426E5 2002-04-07 Kirill Ponomarew <ponomarew@oberon.net>
      Key fingerprint = 58E7 B953 57A2 D9DD 4960  2A2D 402D 46E9 AEB4 26E5
 uid                            Kirill Ponomarew <krion@netic.de>
 uid                            Kirill Ponomarew <krion@guug.de>
 uid                            Kirill Ponomarew <krion@FreeBSD.org>
-sub  1024g/0CEE1A9B 2002-04-07
+sub  1024g/0CEE1A9B 2002-04-07 [expires: 2005-07-03]
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 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
-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
+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
-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
-/V9mzIKIAJ4t9TIuZLbKZjDxDY8Acz+a2+W7SA==
-=K6me
+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
+=CQAn
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>