Index: head/share/pgpkeys/feld.key
===================================================================
--- head/share/pgpkeys/feld.key	(revision 46882)
+++ head/share/pgpkeys/feld.key	(revision 46883)
@@ -1,47 +1,58 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh feld 1F13E252;
+sh addkey.sh feld 983B64501F13E252 ;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
-pub   2048R/1F13E252 2013-11-09 [expires: 2014-11-09]
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
+pub   2048R/983B64501F13E252 2013-11-09 [expires: 2015-11-11]
       Key fingerprint = 7481 93E6 C417 1C8A 4B6B  2488 983B 6450 1F13 E252
-uid                  Mark Felder <feld@FreeBSD.org>
-sub   2048R/C025EB78 2013-11-09 [expires: 2014-11-09]
+uid                          Mark Felder <feld@FreeBSD.org>
+uid                          Mark Felder <feld@feld.me>
+sub   2048R/80920C42C025EB78 2013-11-09 [expires: 2015-11-10]
+
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: GPGTools - https://gpgtools.org
 
 mQENBFJ+fscBCADUK9gato2CJd/8M9K3Csa9UDRnnyXkkk2aqMZegLBDtRvuxoI6
 UeaBEFm8tW9eA29ugL77OAL2BfiEvxqQ+LmgFHSLs2yYU/wgvRNa6ia5gCnvdAtG
 D92AEPqycjqYovXMLZycnAF3MqW4QYbG00ax1dlX2R+SXtX/OY/gWds+ggaL7kUv
 AeR8wlYbvBL2Bo3fGbbZjJNsVPzgQe2VNAALnUHAv5HjZRcypF1NkGg/F+ZJMomC
 ztCHaWk3OwTlDsjhvup5Z/k2/inUfc64bCK49+jdUiiWsWTH+r4NrduZvqvcbtDo
-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
-=XAx6
+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
+CLAo3o5O2MoA0mHj
+=jbnE
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>