diff --git a/share/pgpkeys/mat.key b/share/pgpkeys/mat.key
index b360dee2ba..4ad6b9f5f5 100644
--- a/share/pgpkeys/mat.key
+++ b/share/pgpkeys/mat.key
@@ -1,53 +1,89 @@
 <!-- $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 <mat@mat.cc>
 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
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 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
-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
-0UUQlczaAKClwVDBgo8tLRlAodRzm9DV9JluNA==
-=DM7P
+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
+=L6WD
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>