Index: head/share/pgpkeys/cs.key
===================================================================
--- head/share/pgpkeys/cs.key	(revision 53733)
+++ head/share/pgpkeys/cs.key	(revision 53734)
@@ -1,89 +1,89 @@
 <!-- $FreeBSD$ -->
 <!--
 sh addkey.sh cs 34EF3FF33C29811A ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   4096R/34EF3FF33C29811A 2017-12-21 [expires: 2019-12-21]
+pub   rsa4096/34EF3FF33C29811A 2017-12-21 [SC] [expires: 2020-12-31]
       Key fingerprint = 3626 000C 0372 A78C 5DD7  B096 34EF 3FF3 3C29 811A
-uid                          Carlo Strub <cs@carlostrub.ch>
-sub   4096R/6532CB666A0E2F2E 2017-12-21 [expires: 2019-12-21]
-sub   4096R/EB6E99AFC6017D02 2017-12-21 [expires: 2019-12-21]
+uid                            Carlo Strub <cs@carlostrub.ch>
+sub   rsa4096/6532CB666A0E2F2E 2017-12-21 [E] [expires: 2020-12-31]
+sub   rsa4096/EB6E99AFC6017D02 2017-12-21 [A] [expires: 2020-12-31]
 
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 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
-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
+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
-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
+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
-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
-eStXlIc=
-=8Ew1
+PwARAQABiQI8BBgBCAAmAhsgFiEENiYADANyp4xd17CWNO8/8zwpgRoFAl4M1fgF
+CQWxzxkACgkQNO8/8zwpgRrAMA//S5RSoqSl4SXQAG9P/t5RPpE1F4KSaKmZYK7f
+5v0M2e7MYV3tQhSCPA3bdNJ+Cd+rJh/uJHUctUCKakRWmZgGsm07xl3r4dnjaH7d
+zk5hPE8dVeEPu92/oNzxn70n7eSo1/iIZ7U04OoQrEW3PIzQNXQAtVbwuSAWZ8nX
+eus3lMFOsxhZKdmZqDfWEScvLzI/I3ji3cTfW995M4TlKNsNJHmzyb1yXTE7l9FM
+L1unNuV8HWE+Q+GUeoGV5bxP1mQy2Yme6zYoHr4AuCgMFBnn2U5fWMEdVJxzdDAi
+eXav+lBSWwZTGbTlohrk0n37/rPJ+RTRFaYcv9Bb4p+loUqcsFs68DtYuzvcIbtl
+YRUOljRX3G+d9CNaCgbygDbTupGzt5N/j2N9wf0yBPKPj3NiHynbIpR6DvkOfFkv
+JWpQPRR2bYL448FT6cYKnI8WqSkK1yB6Rg+RmXgAhos2r4bOmAUYesrDfHW7lY+b
+8/a0+3wVajil9joWIFIaahqz622SEahpCY5MOfXPn1sBHNHyCsNdHQTxnKg6jQyG
+btepxl3sasHCTRDm8KtsBv2smFC5aUZjfhtLNTWdk/MIodKh17tY5+gwXdXl6C8o
+oLRmLMsz82FZOsEJRro7IpoWGbVhN0+vz3K01okuQ+GwMd17cG3GwcW/PA4+ZxvR
+Mj9/NCk=
+=5d7Z
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>