Index: head/share/pgpkeys/mm.key
===================================================================
--- head/share/pgpkeys/mm.key	(revision 49745)
+++ head/share/pgpkeys/mm.key	(revision 49746)
@@ -1,48 +1,77 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh mm 4261B0D1;
+sh addkey.sh mm F040F7196BA99AF4 ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   1024D/4261B0D1 2007-02-05
-      Key fingerprint = 17C4 3F32 B3DE 3ED7 E84E  5592 A76B 8B03 4261 B0D1
-uid                  Martin Matuska <martin@matuska.org>
-uid                  Martin Matuska <mm@FreeBSD.org>
-uid                  Martin Matuska <martin.matuska@wu-wien.ac.at>
-sub   2048g/3AC9A5A6 2007-02-05
+pub   rsa4096/F040F7196BA99AF4 2016-12-17 [SC] [expires: 2019-12-17]
+      Key fingerprint = CB55 7883 60B9 92FA 0885  C878 F040 F719 6BA9 9AF4
+uid                            Martin Matuska <martin@matuska.org>
+uid                            Martin Matuska <mm@FreeBSD.org>
+sub   rsa4096/55C10957CD8D760F 2016-12-17 [E]
+
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQGiBEXHDPMRBACme6PyRAt6LcfVO5LiPbtq6rYu4e8zrUjd7o+FiCEYjdF8VwXU
-3RQ76f1cx2tnNyvv7KEQX2/NyPHQH/3n3Cu5w8BToQrV6sEAMP59nWOIKSNTXNGN
-BAbFXvRDC1vlPXyXaeRt6InF90FmJ/ZJpTX1wYGenYymZtBSPd3q1iK6DwCgn/I2
-9FLTUjOm2qknqLGGZJ/w96cD/i6CDQa1VzwyplIKCbPDqNyJh3qW23JMkW3OGwRk
-nY8H4RrR3LNfCpiBuzw8JtO8vDT/NoUKG4rXFMYz0pPfPbWnJD+qtGEl3fXtNC3f
-a4YwTTDil5VSi846IjHK2rEwDvUkMAyiEbthOIf2U8JRn0KThPYb0alPyNuF+zaM
-HUUxA/wNYHb/qjqCI0iwSNxTYKeruBcua4yg7NKeeHtA0an95CfT+AyEW6inQ0Od
-WSrDljmZbq0YGFndRZnxlwClzA2ueS3+/F4ADvn0kONhzXfVewRayOHXLiXlcV2d
-4+g3oYMWVsR/DAi12ezzvkHnDWsSeeXPKkBXMAczmKd484RpbLQfTWFydGluIE1h
-dHVza2EgPG1tQEZyZWVCU0Qub3JnPohgBBMRAgAgBQJGEkt4AhsDBgsJCAcDAgQV
-AggDBBYCAwECHgECF4AACgkQp2uLA0JhsNH48wCfbHM5Tu8ABaGHO1Nlv0jtrc8L
-D4UAnjIzKUyR6A0ReHlqZyAQA7XQ0lxztCNNYXJ0aW4gTWF0dXNrYSA8bWFydGlu
-QG1hdHVza2Eub3JnPohiBBMRAgAjAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AF
-AkYSS5kCGQEACgkQp2uLA0JhsNH6FQCdH3LhF9TLVQbd5q5sYYR48zmXaPoAljRf
-JtDTR6ZLdjVowmZAmSlsFda0LU1hcnRpbiBNYXR1c2thIDxtYXJ0aW4ubWF0dXNr
-YUB3dS13aWVuLmFjLmF0PohgBBMRAgAgBQJGEkthAhsDBgsJCAcDAgQVAggDBBYC
-AwECHgECF4AACgkQp2uLA0JhsNHkiQCeMQACotd+npbhK1pJMKBcFOHrzUwAoJYn
-ZRIacsYvjMBNsx4UUkfYs70wuQINBEXHDQUQCADlHvWxPueR0sgha8L1Fwp4yTE6
-AbqAnkYw/nC/2q/oUDg97VFdZM0tOi67sLYHic3Fj/Il7w78jctdlpagW52b+R2J
-l3LFOYlbmbWkUj7iUFrDA0QZwO9IZw2yxDP3zkEMvPh9YtngmgI8CKRtXrxgY3+7
-9gEN/evBiEgS9rN5/tGI5V2Pt+VTXWfw25zRnOTTThgL/sRtqKykSJ6nsJfwO2DY
-0VFpb9ndFR/zG4ozJLupV+ku0EQv2xXlOdvhdWkLgXN+JRtrP1CxWzPTA6CP+m/X
-cYiT498yBauwk+JTGqeOKUfn27vpycGmf/VGwBoh2GrhzXRnOVBkDXb20ztzAAMF
-B/4/cFjtT3rdyJpFRoSl81Nvj8/DvP1ICovH2YUY+bIdUU83Id6AqKv5vOWhlhbR
-5Np9EtWkdyInXHhzs1MDm1xdNFmwkVFJB+M/XNmj5lgZ+e1riuoo07WcwKN8LdBY
-oOoSoKViSzEoJwlkQazOCAURSWHIlr7rYwM17oAgDjJ4PjBs4l3zjIt+wNU40wYy
-JOnBxjyK5ucKUAHq/6vgLmvj+QZvhcDLpKxRvw5M9PLeD1iomiY3qzNRlOF4aUr7
-GX8wbk+a9rsiC8dIGn++9D3BrvGvVLqxEruflXmpokyalalitIL3N3WitPjMu7gW
-EUotHnqcf3TGK7N7ffv0SXRpiEkEGBECAAkFAkXHDQUCGwwACgkQp2uLA0JhsNHl
-SgCgn7/wkepKhD2TrONJELS0/iy8WjcAnRhJSMsrJApfDOhu0ER1TqP+cFy5
-=HbmE
+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
+=jHVf
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>