Index: head/share/pgpkeys/mandree.key
===================================================================
--- head/share/pgpkeys/mandree.key	(revision 49307)
+++ head/share/pgpkeys/mandree.key	(revision 49308)
@@ -1,59 +1,81 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh mandree 052E7D95;
+sh addkey.sh mandree E412B156EFF3855A ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   1024D/052E7D95 2003-08-28
-      Key fingerprint = FDD0 0C43 6E33 07E1 0758  C6A8 BE61 8339 052E 7D95
-uid                  Matthias Andree <mandree@freebsd.org>
-uid                  Matthias Andree <matthias.andree@gmx.de>
-sub   1536g/E65A83DA 2003-08-28
+pub   rsa4096/E412B156EFF3855A 2015-09-09 [SC] [expires: 2019-08-17]
+      Key fingerprint = DC4A 655B D993 CD48 71FA  8210 E412 B156 EFF3 855A
+uid                            Matthias Andree <matthias.andree@gmx.de>
+uid                            Matthias Andree <mandree@FreeBSD.org>
+sub   rsa4096/9437860BAA89B603 2015-09-09 [E] [expires: 2019-08-17]
+
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-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
-=PvSJ
+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
+PybCXGwIIILO
+=H/Oz
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>