diff --git a/share/pgpkeys/marck.key b/share/pgpkeys/marck.key
index 802998a838..54ff683ce5 100644
--- a/share/pgpkeys/marck.key
+++ b/share/pgpkeys/marck.key
@@ -1,54 +1,79 @@
 <!-- $FreeBSD$ -->
 <!--
 sh addkey.sh marck 6B691B03;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub  1024D/6B691B03 2001-07-20 Dmitry Morozovsky <marck@rinet.ru>
-     Key fingerprint = 39AC E336 F03D C0F8 5305  B725 85D4 5045 6B69 1B03
-uid                            Dmitry Morozovsky <marck@FreeBSD.org>
-sub  2048g/44D656F8 2001-07-20
+pub   1024D/6B691B03 2001-07-20
+      Key fingerprint = 39AC E336 F03D C0F8 5305  B725 85D4 5045 6B69 1B03
+uid                  Dmitry Morozovsky <marck@rinet.ru>
+uid                  Dmitry Morozovsky <marck@FreeBSD.org>
+sub   2048g/44D656F8 2001-07-20
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 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
-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
-KX84wMOTyluPNU+o
-=+K0J
+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
+=PgXW
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>