Index: head/share/pgpkeys/grembo.key
===================================================================
--- head/share/pgpkeys/grembo.key	(revision 49912)
+++ head/share/pgpkeys/grembo.key	(revision 49913)
@@ -1,51 +1,51 @@
 <!-- $FreeBSD$ -->
 <!--
 sh addkey.sh grembo 6897F8C16BFAFF9F ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   2048R/6897F8C16BFAFF9F 2014-01-20 [expires: 2017-01-19]
+pub   rsa2048/6897F8C16BFAFF9F 2014-01-20 [SC] [expires: 2020-02-02]
       Key fingerprint = E842 4082 12D2 767A E29E  FCA4 6897 F8C1 6BFA FF9F
-uid                          Michael Gmelin <grembo@freebsd.org>
-uid                          Michael Gmelin <freebsd@grem.de>
-sub   2048R/9A052F3BB4E23160 2014-01-20 [expires: 2017-01-19]
+uid                            Michael Gmelin <grembo@freebsd.org>
+uid                            Michael Gmelin <freebsd@grem.de>
+sub   rsa2048/9A052F3BB4E23160 2014-01-20 [E] [expires: 2020-02-02]
 
 ]]></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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
-vNELuqX+aHKSS6vEwwwZ
-=A9V4
+yx8AEQEAAYkBJQQYAQoADwIbDAUCWJNyzwUJC1l5eAAKCRBol/jBa/r/nyrcB/wO
+SYd35jE9MjusechzgNrB6z1JaJ3ZAgYzOcJJw6RUn15CzRGIfj3uKMm3gDcyQ6Zd
+t5pYiOdXh7Pt75MBIqiYP2szFBSVfj77Ma7wFbR7VyO5OVyU6VSFnfCS1OVBcTgw
+hH+TIgiC2wIvsmqRHNgad1qSy6mnrdP0VfqTTXR2zY9n0gdnBWayY5Q7GtNSuwIA
+mG9C+HebmMmlUbgXPrzdByRUM/8xGGCQJ5AAXgiHI+iGX1Pe4yN84Om4QkJg5PMl
+KwNP67xiFUoz7Y2Lcb9WI+WH2ZIOfRYlcZoVxM1m/ulgaxGOleA6taF8uuDFBnJ2
+HfJ+96gJSdpkN5PEsRrz
+=Vj4A
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>