diff --git a/share/pgpkeys/mat.key b/share/pgpkeys/mat.key
index 4ad6b9f5f5..c3dfd61858 100644
--- a/share/pgpkeys/mat.key
+++ b/share/pgpkeys/mat.key
@@ -1,89 +1,116 @@
 <!-- $FreeBSD$ -->
 <!--
 sh addkey.sh mat 6CFFBE67;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
 pub  1024D/6CFFBE67 2003-07-21 Mathieu Arnold <mat@FreeBSD.org>
      Key fingerprint = 1A5F 2DBB 56F5 817E 8AFF  51B2 A986 29CC 6CFF BE67
 uid                            Mathieu Arnold <m@absolight.net>
 uid                            Mathieu Arnold <arn-mat@micronet.fr>
 uid                            Mathieu Arnold <mat@mat.cc>
 uid                            Mathieu Arnold <arn_mat@club-internet.fr>
 uid                            Mathieu Arnold <mat@cpan.org>
 uid                            Mathieu Arnold <mathieu.arnold@t-online.fr>
-sub  1024g/830CAC4B 2003-07-21
+sub  1024g/830CAC4B 2003-07-21 [expires: 2005-01-21]
+sub  2048R/A498469E 2004-01-22
+sub  2048R/09EB7735 2004-01-22
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 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
-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
-=L6WD
+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
+=D7im
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>