diff --git a/share/pgpkeys/mtm.key b/share/pgpkeys/mtm.key
index c700967f72..2f60b4dc25 100644
--- a/share/pgpkeys/mtm.key
+++ b/share/pgpkeys/mtm.key
@@ -1,45 +1,51 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh mtm DBCC68B9;
+sh addkey.sh mtm 7CD41F55;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub  1024D/DBCC68B9 2002-11-23 Mike Makonnen <mtm@FreeBSD.org>
-     Key fingerprint = D228 1A6F C64E 120A A1C9  A3AA DAE1 E2AF DBCC 68B9
+pub  1024D/7CD41F55 2004-02-06 Michael Telahun Makonnen <mtm@FreeBSD.Org>
+     Key fingerprint = AC7B 5672 2D11 F4D0 EBF8  5279 5359 2B82 7CD4 1F55
+uid                            Michael Telahun Makonnen <mtm@tmsa-inc.com>
 uid                            Mike Makonnen <mtm@identd.net>
-sub  2048g/9AEE33B8 2002-11-23
+uid                            Michael Telahun Makonnen <mtm@acs-et.com>
+sub  2048g/E7DC936B 2004-02-06
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.1 (FreeBSD)
 
-mQGiBD3fRBQRBACTeC/ac7IDcv4v+oB1EB0K0+soiCMsRx4uNL5+VI0IffKPwIQQ
-dZOam8/GuYtzQMCZOCPTWc/teVvi4Go0gat4mYITqt1n5+OSMv7w4yK8o1yNOona
-wo2i4TzJg+fRDbU8hUb2i1q38WYcwok/Gulfp0Ioxq6pPzl28CdgdlQGlwCg8Ebf
-y8oAInL7nGa0AxzgNSJoZgED/A3iaUHdICb647+43W8L6OtAD0xOsTmE7Qpvs9gz
-aaW7fTPZfRL1XERgEv2AWzLHjGAbnkg619REuiOreUFBc5TAvd50//ylh2DgNvlx
-4WOpT9X/LkrbfPRteWhczZOkC9qe3Ib6gU5rFbqGb5KaP5k3QEwTOyu6PolOzYj6
-0mhUBACGRbVBD8t9tkBmSKYdW4HIFKRa+rxbIo17RvOFtMxrZUqeEIts5g3AdDkk
-TRHS3TXYGPCcf6VNscGgtJ+PUDWUIJTwSUL67E+i3VApXvgUeQ4ghCVJZ8bkcxjG
-x0n3JgKs7sSZ7s3HOEPRnCxPQ8F5Pf122ANMkm1EU7sK2zKgkbQeTWlrZSBNYWtv
-bm5lbiA8bXRtQGlkZW50ZC5uZXQ+iFkEExECABkFAj3fRBQECwcDAgMVAgMDFgIB
-Ah4BAheAAAoJENrh4q/bzGi569UAoObhwwmRyFvv2bilTfywRYrSr8ADAKDuHMdv
-rwAL4H+OiwuKHeq6/TgGeohGBBMRAgAGBQI+E7wEAAoJEIf5oyUW2nJ6xBQAnRXv
-3F5F4Lv45odLjCRTBOyEP8KsAKCFar/HOOxTbGjdnLhrotNbywVsXbQfTWlrZSBN
-YWtvbm5lbiA8bXRtQEZyZWVCU0Qub3JnPohcBBMRAgAcBQI+GIM0AhsDBAsHAwID
-FQIDAxYCAQIeAQIXgAAKCRDa4eKv28xouQeyAJkBJHNiVu9/0xPJ7rcmqX7tjPSf
-jwCg6kwp7it5O9K+/AlDbFUDpAZzzQa5Ag0EPd9EKRAIAJEEwVSqL41B5+19CtU+
-Tp4EbdVoVhc9l1Fb2jWLoT8g3/GggJFD08VxSZnqmAzJQTnQ8WjcoKO9IUYDAV31
-17vNxr8RfXM5uqdDX0owsHju562koNTv1/bce+IUchbx9IYGGMr4dKph7Y2uEQE+
-K0SSbX1rJOZ4ZdIu+FBW0jUvX4RjW/HuJ42lyUL7m1E0HQ8psDyGfS+NccPvT+HY
-QWPuoq9FlwmcHEJPUlYT4/f1qV3SOD6JEeVx+7xSPe5GXDYQRdDaA+dl+Vk6xEaU
-GR3aROu1Ce5vqkOT5u+0nL+cQtHYxSfK15H71EE7zf08ZZvJ/lAQ3xQ811r+pbRp
-Dj8AAwUH/it0Q7pS4TCGcM180jXGxBURYhXIj5J5bCk7v4mMVT07Wbwm9EohtPR1
-0kNleHa3GCKmkVSIwiz9uXGaoin0uArzYa4oAMGlIvzGfdEl9CtZkLMEmn7qlDSL
-RyRrvGzQedrbrW/1JuaN00I1hxCLKHzkTqGl4L+Cq/V3YLkfMT5tDaac44fLGUAF
-CxkgdTsoYTvjrw3fsUSwvSIFvdEv8zfmV51vKLgFsU5tGyDfVGtbLk5Eo4noHidK
-KpdW696sLjTZczzLLpJ8yybK+IroJTifY4wgi4bN0ZooObEYDPeYf86KBJQBZLeC
-ea9ZV3SM4TO/1OKHpWbOcxDadVkTpkSIRgQYEQIABgUCPd9EKQAKCRDa4eKv28xo
-uTqtAJ0RBqUFaqqFrp6K7Gzkfvyv6yAr5QCeNhdFijTm7IVP06J97BvfSt3YYwE=
-=Mwcu
+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
+=TuyI
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>