Index: head/share/pgpkeys/markm.key
===================================================================
--- head/share/pgpkeys/markm.key	(revision 46325)
+++ head/share/pgpkeys/markm.key	(revision 46326)
@@ -1,93 +1,89 @@
 <!-- $FreeBSD$ -->
 <!--
 sh addkey.sh markm FB57D793;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   1024D/FB57D793 2000-01-20
       Key fingerprint = 3FB6 3D12 0CF0 611F 0441  CD18 CD0B 8A35 FB57 D793
 uid                  Mark R V Murray <mark@grondar.org>
 uid                  Mark R V Murray <mark@grondar.za>
 uid                  Mark R V Murray <markm@uunet.co.za>
 uid                  Mark R V Murray <markm@freebsd.org>
 sub   2048g/EB82BBFC 2000-01-20
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG/MacGPG2 v2.0
 Comment: GPGTools - http://gpgtools.org
 
 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
-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
-LSHdT4jgUq8Ns7ga4w==
-=DsAW
+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
+=l1Dp
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>