Index: head/share/pgpkeys/kan.key
===================================================================
--- head/share/pgpkeys/kan.key	(revision 46774)
+++ head/share/pgpkeys/kan.key	(revision 46775)
@@ -1,44 +1,93 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh kan C9BE5D96;
+sh addkey.sh kan 0713229992792E7E ;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
-pub   1024D/C9BE5D96 2002-07-01
-      Key fingerprint = 7474 A847 DBF5 50A5 FC3E  F223 43AC F58C C9BE 5D96
-uid                  Alexander Kabaev <kabaev@gmail.com>
-uid                  Alexander Kabaev (FreeBSD committer account ID) <kan@FreeBSD.ORG>
-sub   1024g/534D9E06 2002-07-01
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
+pub   rsa4096/0713229992792E7E 2015-06-05 [expires: 2018-06-05]
+      Key fingerprint = C5F7 D995 99B6 41E1 3C51  5691 0713 2299 9279 2E7E
+uid                          Alexander Kabaev <kan@freebsd.org>
+uid                          Alexander Kabaev <kan@fb.com>
+uid                          Alexander Kabaev <kabaev@gmail.com>
+sub   rsa4096/BB68B7A439D5FFAC 2015-06-05 [expires: 2025-06-02]
+
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQGiBD0fyVQRBAC6DXZDVJoFc4CPKODmJmep0t5dD+ObG0hYiMfo4ygDAvsftJPv
-ZR69EUbKCqVOXPy5InOR1o1xwERvNVXxBGOFwAdoU4eJt/f3ttR6YSLWDG3iHWRQ
-Fze9mtZ3bCBcdv8V0pXint/w41y9nBmG03F+Ag2toD5mHYqV+9vqH3XTmwCg7Rq9
-K/Pk7Z5lAR/XWyJv6Bk8op0D/j6Jef2ate9+NwBAti+9GgIocBGx36X/SpZonGOV
-xtX5E2MranZGCVnbdW1hXfKLaiRrooSxbGpMnFbjqY+peHZ905pd+3v++L0sGSUA
-gLbGL+5GFDO/WGay0vTUBs7Bl+1cbsdeQ67+08WuIRfcbDjA9fYxI9LLTb4J+IrD
-Ni36A/9WBGxkXNJCTrtAqhCoHRgfo1CHNk+U3KiIlwFfvi1WRkqEgFNQ6aLNsPcT
-DkIoPLj2hqKf0Pfrr1MWGcQF1uYxtW8diFH9FzlZpkwXvHPOBsJSWtH8qcZ7atFC
-EIwvZzurMbYWaTGNYMEL3kj9aRjKb2OnsKABZ25H1cioFReMx7QnQWxleGFuZGVy
-IEthYmFldiA8a2FuQGthbi5kbnNhbGlhcy5uZXQ+iEkEMBECAAkFAlCtcHYCHSAA
-CgkQQ6z1jMm+XZYzSwCgx20s6h6+tB6nj7gs0mHRmXEd9rkAn3PbiVCY7AvRcQKd
-jzMg1fh609+NiF4EExECAB4FAkLcBooCGyMGCwkIBwMCAxUCAwMWAgECHgECF4AA
-CgkQQ6z1jMm+XZYJIACePCBQpk+mw0WvLAkE7I5DkeCv4w0An3MKAuq3Acnzxw5J
-1U5XsB0nooiStEFBbGV4YW5kZXIgS2FiYWV2IChGcmVlQlNEIGNvbW1pdHRlciBh
-Y2NvdW50IElEKSA8a2FuQEZyZWVCU0QuT1JHPohZBBMRAgAZBQI9H8lUBAsHAwID
-FQIDAxYCAQIeAQIXgAAKCRBDrPWMyb5dltYPAKDD2YYKr7ZDEbVKAdyHOyF5dl+h
-3wCdFWg9dC8w6dD7nUKvg9b8cq91byy0I0FsZXhhbmRlciBLYWJhZXYgPGthYmFl
-dkBnbWFpbC5jb20+iF4EExECAB4FAkLcBkICGyMGCwkIBwMCAxUCAwMWAgECHgEC
-F4AACgkQQ6z1jMm+XZadUgCggxcqTFp+zV2YOM+cDlVtreVZDo0An1kXV2vUaxap
-0fQTq2QMfGyMbsG8uQENBD0fyVQQBADOlRurkQxMzKcXE8Wfb9dimYC9gyNso19f
-yKAJGxD1lgvJeVyf2OR4k/d6ctQAcNuv3qT0al9rE5DQMiI3fC6xLA/xJekqDCu6
-LLjdwLYXJtjSq6HyY2qUS4+sdPJSpVadaMKE1jLVEYCtXi/Q1gTfwPDQp0GzSS7i
-gyouzi3QuwADBQP/d8b4C53pgkrcHQ/xOv4UW5KQrJg5DZMMxZ6gF3IGFGF99kHi
-d+zBtrzzlq6PmFpDf69LRaISk0qnjDAsrRt/ypnsRnQ6YOmTSSOKK6y7runPTwaP
-/gSFeDFk+9ZNxjebpcoN6SHFxi3V/4ITVJfXQJIU/BT05A6LeZGYykTdrCOIRgQY
-EQIABgUCPR/JVAAKCRBDrPWMyb5dlpHKAJ4x+Ltw0UyNi82weZpghm6b02OVvQCb
-BB6jh/RjnfLoZ/Cq2dke6K5Heok=
-=4r9K
+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
+kh/amQMwljMKuSA=
+=4llO
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>