diff --git a/share/pgpkeys/max.key b/share/pgpkeys/max.key
index a093f6e04e..ce0fb81296 100644
--- a/share/pgpkeys/max.key
+++ b/share/pgpkeys/max.key
@@ -5,19 +5,14 @@ sh addkey.sh max CE356B59;
 <programlisting role="pgpfingerprint"><![CDATA[
 pub  1024D/CE356B59 2000-02-19 Masafumi NAKANE <max@wide.ad.jp>
      Key fingerprint = EB40 BCAB 4CE5 0764 9942  378C 9596 159E CE35 6B59
-uid                            Masafumi NAKANE <max@w3.org>
 uid                            Masafumi NAKANE <max@FreeBSD.org>
-uid                            Masafumi NAKANE <max@jp.FreeBSD.org>
-uid                            Masafumi NAKANE <max@sfc.keio.ac.jp>
-uid                            Masafumi NAKANE <max@sfc.wide.ad.jp>
 uid                            Masafumi NAKANE <max@accessibility.org>
 uid                            Masafumi NAKANE <kd5pdi@qsl.net>
 sub  1024g/FA9BD48B 2000-02-19
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.0.6 (FreeBSD)
-Comment: For info see http://www.gnupg.org
+Version: GnuPG v1.2.2 (FreeBSD)
 
 mQGiBDiuMYURBACEgL3d4mL0pojugj8TZFEQef+MKkXB3lazrqV2ahgWqt6K24qr
 5fZrGkI8vxmYR4VkI1eLfe0Q4LoBZifL5nJYEvMvWPmdLuYjp4iwjgBdzLnwr59+
@@ -27,32 +22,18 @@ BVPeuM0y7JH0ucRygUqc4acD/jfe/UEjGBWxOCfZYOnXEp4NXWis3xRyUDO3cuoG
 TYyqKL1tG/fKUgtevZSi7o1x/N0bgIBqmzd30Cqx29p7juVV+SBcKCRT1qloz6fc
 a5B6A/wJD5n3HOAStsWpZ6To/Apdb4A3PD4+ePfQxSICsHCFg/M04FkrG48So2qc
 7dSq6UH3xLsoiRIUonwCQsT+PaQQMrZNKjfal9xlEFfw1TV/squ+oNE8E24Lkzxt
-8Kkn86Ec5uiUlRulSMG9HJuWM+9Qu7TF76FWP8llVp6ELkYCGrQgTWFzYWZ1bWkg
-TkFLQU5FIDxtYXhAd2lkZS5hZC5qcD6IVgQTEQIAFgUCOK4xhQQLCgQDAxUDAgMW
-AgECF4AACgkQlZYVns41a1lf7ACghqt5jsXLE3eumP7iF/f6IrdEfP4AoJoELmfB
-NTAPCqi/9tDbWpX6F7cpiFcEExECABcFAjv4SWMFCwcKAwQDFQMCAxYCAQIXgAAK
-CRCVlhWezjVrWVhHAJwLyXg92vAco2tmVNbq+h3qRiBHdgCeLyItRlblJ7qdMf1a
-43Rdg+llEbm0HE1hc2FmdW1pIE5BS0FORSA8bWF4QHczLm9yZz6IVgQTEQIAFgUC
-OL9xNQQLCgQDAxUDAgMWAgECF4AACgkQlZYVns41a1nRvwCdE9e1JBBgaL6amStq
-UelgwPojlbEAn3G7EPLZdvSAkQvnoJ8DvUDlnbMYtCFNYXNhZnVtaSBOQUtBTkUg
-PG1heEBGcmVlQlNELm9yZz6IVgQTEQIAFgUCOL9v/QQLCgQDAxUDAgMWAgECF4AA
-CgkQlZYVns41a1kCuQCgqQmFbPWxfQ3cJQ15xXSY69xtch0AnRomUMHNK5GtX1Ud
-ySfq8eeE/VbliFcEExECABcFAjv4RDQFCwcKAwQDFQMCAxYCAQIXgAAKCRCVlhWe
-zjVrWUEIAKCgwVSawCg1Lzrbf8uZdMAfeOWFXQCcD7EFtsdhbEV62AOUeQQWPr9d
-e1O0JE1hc2FmdW1pIE5BS0FORSA8bWF4QGpwLkZyZWVCU0Qub3JnPohWBBMRAgAW
-BQI4v3GGBAsKBAMDFQMCAxYCAQIXgAAKCRCVlhWezjVrWVvAAJ9KtSTXlj6U2gn6
-BlIeQdWKVCUcKACfVlGCgFivVGsH9ti0Hvm7FrD27Ka0JE1hc2FmdW1pIE5BS0FO
-RSA8bWF4QHNmYy5rZWlvLmFjLmpwPohWBBMRAgAWBQI4v3FbBAsKBAMDFQMCAxYC
-AQIXgAAKCRCVlhWezjVrWUwkAJ0US6KSGeYx0I6ora9Zmx1E9puhYQCfUSDL1ir9
-jawLBiUbleq3pP4A98G0JE1hc2FmdW1pIE5BS0FORSA8bWF4QHNmYy53aWRlLmFk
-LmpwPohWBBMRAgAWBQI4v3FvBAsKBAMDFQMCAxYCAQIXgAAKCRCVlhWezjVrWXqs
-AJ9LfYoEK3/WCMSfA9izdp2ChAIH4QCbB6DOxxghRtZQSt7RmZUk1+tfb0m0J01h
-c2FmdW1pIE5BS0FORSA8bWF4QGFjY2Vzc2liaWxpdHkub3JnPohXBBMRAgAXBQI7
-+ERfBQsHCgMEAxUDAgMWAgECF4AACgkQlZYVns41a1lUuwCgsIhWJdtPBebkV6w+
-NQ/8jlkJgrwAnj9lZkiTAgl1E/vcF7yPbY7fHlHetCBNYXNhZnVtaSBOQUtBTkUg
-PGtkNXBkaUBxc2wubmV0PohXBBMRAgAXBQI7+ESBBQsHCgMEAxUDAgMWAgECF4AA
-CgkQlZYVns41a1nv1ACggYgtKhaprmMs30ozyoC0NatFJ44AoI0XSPh2G9zHEjF8
-AyYAe6sVCLqvuQENBDiuMdYQBADVzBBn5+1UQVCLS51y6eCD3TidT/uJAr+eeiWZ
+8Kkn86Ec5uiUlRulSMG9HJuWM+9Qu7TF76FWP8llVp6ELkYCGrQhTWFzYWZ1bWkg
+TkFLQU5FIDxtYXhARnJlZUJTRC5vcmc+iFcEExECABcFAjv4RDQFCwcKAwQDFQMC
+AxYCAQIXgAAKCRCVlhWezjVrWUEIAKCgwVSawCg1Lzrbf8uZdMAfeOWFXQCcD7EF
+tsdhbEV62AOUeQQWPr9de1O0J01hc2FmdW1pIE5BS0FORSA8bWF4QGFjY2Vzc2li
+aWxpdHkub3JnPohXBBMRAgAXBQI7+ERfBQsHCgMEAxUDAgMWAgECF4AACgkQlZYV
+ns41a1lUuwCgsIhWJdtPBebkV6w+NQ/8jlkJgrwAnj9lZkiTAgl1E/vcF7yPbY7f
+HlHetCBNYXNhZnVtaSBOQUtBTkUgPGtkNXBkaUBxc2wubmV0PohXBBMRAgAXBQI7
++ESBBQsHCgMEAxUDAgMWAgECF4AACgkQlZYVns41a1nv1ACggYgtKhaprmMs30oz
+yoC0NatFJ44AoI0XSPh2G9zHEjF8AyYAe6sVCLqvtCBNYXNhZnVtaSBOQUtBTkUg
+PG1heEB3aWRlLmFkLmpwPohXBBMRAgAXBQI7+EljBQsHCgMEAxUDAgMWAgECF4AA
+CgkQlZYVns41a1lYRwCcC8l4PdrwHKNrZlTW6vod6kYgR3YAni8iLUZW5Se6nTH9
+WuN0XYPpZRG5uQENBDiuMdYQBADVzBBn5+1UQVCLS51y6eCD3TidT/uJAr+eeiWZ
 IbTmXrltNm5rGs7OT9QYNLhCFFPYKJxa9hFbrGpgserEFnqBfxcbMLa/wyIm9m/l
 MI+NNCAU4IpgDWtgjf1kjzwnJPwH69YzcqS2jlEKIjkCrEa/Bpr1Nvo4aLvqlTR8
 tJh+1wAECwP/YBMEMx/zgTvS3Jtji6nPceRe8icGRHb4SD7MVF/WxYu5VK7wlmuw
@@ -60,6 +41,6 @@ tJh+1wAECwP/YBMEMx/zgTvS3Jtji6nPceRe8icGRHb4SD7MVF/WxYu5VK7wlmuw
 082h/MWbJn3Xdg89lp4UG3UP8sV1oWyIchd8rqxFk/EVB7fVQWNz/gKIRgQYEQIA
 BgUCOK4x1gAKCRCVlhWezjVrWUlcAJ467I5lFNlkwcENe5vND+DPaWyreQCfddOu
 6Va2/bf7Ln4TKyl17uRro7Y=
-=YyQE
+=VmY5
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>