Index: head/share/pgpkeys/brd.key
===================================================================
--- head/share/pgpkeys/brd.key	(revision 46684)
+++ head/share/pgpkeys/brd.key	(revision 46685)
@@ -1,49 +1,71 @@
 <!-- $FreeBSD$ -->
 <!--
 sh ./addkey.sh brd ED0A754D;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   1024D/ED0A754D 2005-05-14 [expires: 2014-02-21]
+pub   1024D/ED0A754D 2005-05-14 [expires: 2020-05-10]
       Key fingerprint = 5DFD D1A6 BEEE A6D4 B3F5  4236 D362 3291 ED0A 754D
-uid                  Brad Davis <so14k@so14k.com>
 uid                  Brad Davis <brd@FreeBSD.org>
-sub   2048g/1F29D404 2005-05-14 [expires: 2014-02-21]
+uid                  Brad Davis <so14k@so14k.com>
+sub   2048g/1F29D404 2005-05-14 [expires: 2020-05-10]
 ]]></programlisting>
-<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-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
-=HfL5
+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
+ZKE0AJ9BmdOm/tzGOgP920RU95sUDiRsag==
+=OvLH
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>