Index: head/share/pgpkeys/wblock.key
===================================================================
--- head/share/pgpkeys/wblock.key	(revision 50034)
+++ head/share/pgpkeys/wblock.key	(revision 50035)
@@ -1,51 +1,52 @@
 <!-- $FreeBSD$ -->
 <!--
 sh addkey.sh wblock BB37E0C846CB85CF ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   2048R/BB37E0C846CB85CF 2014-03-13 [expires: 2017-03-12]
+pub   rsa2048/BB37E0C846CB85CF 2014-03-13 [SC] [expires: 2018-03-04]
       Key fingerprint = EC53 662F FEFE D6F4 2DBA  B483 BB37 E0C8 46CB 85CF
-uid                          Warren Block <wblock@FreeBSD.org>
-uid                          Warren Block <wblock@wonkity.com>
-sub   2048R/D79E292E145902B5 2014-03-13 [expires: 2017-03-12]
+uid                            Warren Block <wblock@wonkity.com>
+uid                            Warren Block <wblock@FreeBSD.org>
+sub   rsa2048/D79E292E145902B5 2014-03-13 [E] [expires: 2018-03-04]
 
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 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
-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
-rAAsFRWSLWqrOTOiplU=
-=U5nQ
+d2Jsb2NrQEZyZWVCU0Qub3JnPokBVAQTAQgAPgIbAwULCQgHAwUVCgkICwUWAwIB
+AAIeAQIXgBYhBOxTZi/+/tb0Lbq0g7s34MhGy4XPBQJYuzaQBQkHe3A+AAoJELs3
+4MhGy4XPxXsIAMvgRcnjgelA6c+wVS3NLDwylHF/PHOUrHhXc9ttPoPEiHa19iuy
+rcBPHWTLso0kUOomsmJePZ9e1uzZ//ZS5WbYZVW12AJbASNhosTlomy4v5XVYFSX
+IiWDPjjtHrZI9W8uWe0WhLPHz7l69wowzCbESxgFHAVyXPzritmW6xP7Z7HgzusX
+LF/ZBi3q08J0s9ouS8CPSeHJTAmOv+aFGYRfPEvtRWtkvvTrcpAcHvcMCDzzW9zk
+WMs/LUn8s2yhYnE57QvrdXp1uT2mbgTuZru0+p8V4JfM4uAhvLdj0Nvk3NJmirV7
+lqkpgsDMBa+qMf7/N3hjkBfeb+qwLRe7o9e0IVdhcnJlbiBCbG9jayA8d2Jsb2Nr
+QHdvbmtpdHkuY29tPokBVAQTAQgAPgIbAwULCQgHAwUVCgkICwUWAwIBAAIeAQIX
+gBYhBOxTZi/+/tb0Lbq0g7s34MhGy4XPBQJYuzcQBQkHe3A+AAoJELs34MhGy4XP
+oZ8H/RJ2NcWKNfSH00YJbGaFH0ySUQvLkCwlzbhYTQwDZwFg5LIaxVyYcGT0pVOA
+DitA5g6ssR761eO7A8TY4G+E8SECi37k7Aglu9iPypzY7+yjIOix6fXc2Z76ytC/
+M+3JiIRQ4siqeyED5A/of9PlDslLsjr5HddJKM/CWDcZGL5kU3nL7x6EZTnN0YhI
+Ossqid+9yq7x+4Utq2mj2RLCyWbOhb7FoTcWRKjH68JEslPq6QxGqDti9xCcXK46
+LlQejgb77U8ZrBA+mzCE8JjVheMKeOESwUMSO/9qu9II8s8w4bs+mKgRc0bp+4iw
+iir9I+4UP2WQ9/Y/6k/ROU1ZmSK5AQ0EUyD50gEIALJNe0I3bLrZGOpHJXp+zmea
+7Wgy5PFFN24Ms65AXB5hfSc2ogE76KxiYcMs6darOfNyexp7+L/92P4InWj/j2a9
+I03gSK5Qb3taYjCAFB7tc/2snqp3cUT6Lq+lApLi9d+U2AlSLhAodyjpyfJn/lWV
+7HxiVBclWov55r3TP7cRc2ml0DuLPXf3rU2jTPZTupkePsijxp9w3QcJEaNmK7+p
+XtKUUsYEb9oU/fZHUG0wxq58nOfAmC9MSdwgzpbDWsxCJnyHKZKkv+wTaqd8hcne
+5ENYEG7186Mmyd3rwbEV9EpRtTVSAjZRf5FAMWRWigA14fhKNMhcp9IKyUY5Lv8A
+EQEAAYkBPAQYAQgAJgIbDBYhBOxTZi/+/tb0Lbq0g7s34MhGy4XPBQJYuzdLBQkH
+e3D5AAoJELs34MhGy4XPe2sIAImbondqlmgLCRN0W5sKo5OY0OYLjEHivEdfevgE
+7KleUaHmHPG7rNfIksXiuDfmK3nxQ05wtOzxJz1V9uzjvsthdqhmEjngXjyYk/YB
+tiJkk434OSbx6g0wrJLKkrLWo0dHcl3n6MsQqKzBfyFqOxFGzxHZD6+5wpx9Lkuz
+paXn65KxnisOLHGZqyxAodZcx8Kgts7EfbqQ4Vl8qFifWfTWavFQxra03f+J4Twq
+eVxnME+dh/AC1N3yJ+BHgbVw256OdM2KlI3eTs9FxTqq5RvbRnpZwTUn/vr8efIK
+pIF6jBJAADFa62LBBFFkRtH+bQFo/e+gPMmsOS6W+/VRvCs=
+=73kN
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>