diff --git a/share/pgpkeys/mandree.key b/share/pgpkeys/mandree.key
index 7de151176b..8023a5027e 100644
--- a/share/pgpkeys/mandree.key
+++ b/share/pgpkeys/mandree.key
@@ -1,81 +1,103 @@
 <!-- $FreeBSD$ -->
 <!--
 sh addkey.sh mandree E412B156EFF3855A ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   rsa4096/E412B156EFF3855A 2015-09-09 [SC] [expires: 2019-08-17]
+pub   rsa4096/E412B156EFF3855A 2015-09-09 [SC] [expires: 2021-09-07]
       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]
+uid                            Matthias Andree <matthias.andree@gmx.de>
+sub   rsa4096/9437860BAA89B603 2015-09-09 [E] [expires: 2021-09-07]
 
 ]]></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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
-PybCXGwIIILO
-=H/Oz
+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
+=zhM2
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>