Index: head/share/pgpkeys/markm.key
===================================================================
--- head/share/pgpkeys/markm.key	(revision 52195)
+++ head/share/pgpkeys/markm.key	(revision 52196)
@@ -1,89 +1,93 @@
 <!-- $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
+pub   rsa2048 2013-09-29 [SCEA]
+      9C2F34D013B833C0833990D1B1AFE3F41215A6B1
+uid           [ultimate] Mark Robert Vaughan Murray <mark@grondar.org>
+uid           [ultimate] Mark Robert Vaughan Murray <mrvmurray@icloud.com>
+uid           [ultimate] Mark Robert Vaughan Murray <markm@freebsd.org>
+uid           [ultimate] Mark Robert Vaughan Murray <mark@grondar.za>
+uid           [ultimate] Mark Robert Vaughan Murray <mrvmurray@gmail.com>
+sub   rsa2048 2013-09-29 [SEA]
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG/MacGPG2 v2.0
+Version: GnuPG/MacGPG2 v2
 Comment: GPGTools - http://gpgtools.org
 
-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
-=l1Dp
+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
+=FAH1
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>