Index: head/share/pgpkeys/kuriyama.key
===================================================================
--- head/share/pgpkeys/kuriyama.key	(revision 50091)
+++ head/share/pgpkeys/kuriyama.key	(revision 50092)
@@ -1,49 +1,145 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh kuriyama FE3B59CD;
+sh addkey.sh kuriyama 524A24526282600F EE3C4DBBFE3B59CD ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub  1024D/FE3B59CD 1998-11-23 Jun Kuriyama <kuriyama@imgsrc.co.jp>
-     Key fingerprint = 5219 55CE AC84 C296 3A3B  B076 EE3C 4DBB FE3B 59CD
-uid                            Jun Kuriyama <kuriyama@FreeBSD.org>
-uid                            Jun Kuriyama <kuriyama@jp.FreeBSD.org>
-sub  2048g/1CF20D27 1998-11-23
+pub   1024D/EE3C4DBBFE3B59CD 1998-11-23
+      Key fingerprint = 5219 55CE AC84 C296 3A3B  B076 EE3C 4DBB FE3B 59CD
+uid                          Jun Kuriyama <kuriyama@s2factory.co.jp>
+uid                          Jun Kuriyama <kuriyama@s2factory.co.jp>
+uid                          Jun Kuriyama <kuriyama@imgsrc.co.jp>
+uid                          Jun Kuriyama <kuriyama@FreeBSD.org>
+uid                          Jun Kuriyama <kuriyama@jp.FreeBSD.org>
+sub   2048g/6D4BA0651CF20D27 1998-11-23
+
+pub   4096R/524A24526282600F 2017-03-27
+      Key fingerprint = 2946 27AD 0A49 697F 622D  D59C 524A 2452 6282 600F
+uid                          Jun Kuriyama <kuriyama@imgsrc.co.jp>
+uid                          Jun Kuriyama <kuriyama@FreeBSD.org>
+uid                          Jun Kuriyama <kuriyama@s2factory.co.jp>
+sub   4096R/0E6143E9FE522B48 2017-03-27
+
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.0.6 (FreeBSD)
-Comment: For info see http://www.gnupg.org
 
 mQGiBDZZXiQRBACWc1PcCjIpTl6aCyOMVfz4jlRSKblwib2s07TBwbgR1zMhbPie
 O2K4ZJqTcG4EnbMLEyYMbYwvNdOfUIjMW3VI1PJhRwWthTcbUjubzTu8Zxw+sKME
 ansth0xZW7Ax29UWQcTPxs4SRsCPFO8t+aWwZOm6z0fb5l1vMmKNJuw1+wCg3ZZB
 qK93hQPaOObwglnAIrgNpScD/j0VCEeC8fTMk+ZIo+z0+bUGPGU5cq+4XVXABYLn
 wMfR6Wr5Ys/3VCx4Oyzzgp/HBzcE5HxJukJ2ur3m9IE+uFfY4+HEFiwL++Ke4TWU
 7rn4rKjJYhGJ6iqGFwuxwmHdjcBh/38X0kmrCxyPYpt6xO+sJBP+QOABw3PFlMkF
 PUY5A/9RGU4mm6K7cteNdbHDI8yFNorQs8W8fRb8yP8bw1T8qB5+/rQ5jxAfA5sr
 FCuZsKNFdph9z/I3eFYVW4P8+9gmI2FAAAocWheSyKttAFHx63JRyBqXq9xmHKST
-kuaoQVXeFycSULAPkV67j0/zDL2mis6bRpPopINGgjkia16u6LQjSnVuIEt1cml5
-YW1hIDxrdXJpeWFtYUBGcmVlQlNELm9yZz6IVwQTEQIAFwUCOmRRlgULBwoDBAMV
-AwIDFgIBAheAAAoJEO48Tbv+O1nN4+YAoKeQztEcbPBbbX7DZAHOsGZLrZ2NAJ9a
-WEoFGMT3keQDjtjUI9c8IMh/l7QmSnVuIEt1cml5YW1hIDxrdXJpeWFtYUBqcC5G
-cmVlQlNELm9yZz6IVwQTEQIAFwUCPE3sswULBwoDBAMVAwIDFgIBAheAAAoJEO48
-Tbv+O1nNMp4An22RFzdv9zdNLlcY9GLPFyUrniqiAJ9F9Rhic6qBaXynksNw51Do
-+cLWkbQkSnVuIEt1cml5YW1hIDxrdXJpeWFtYUBpbWdzcmMuY28uanA+iFcEExEC
-ABcFAjxN7RoFCwcKAwQDFQMCAxYCAQIXgAAKCRDuPE27/jtZzYFdAJ9BFckSo4/r
-SMe9UqbRMPK+8FUumwCfYH1pt4t6jFlulLk+9wYA9wISL3e5Ag0ENllesBAIAMSU
-hrKdEdKzQXHzkoE4Nzl3hb6dtDmjgYr+3X95wBkUvtrk2CeYG3RC1PNwd1sEFEWp
-IiSzOaQDzxZmtBGpMkQ1It+CW4sC5Cs2TQ59VHLFw7HWSYMNj+RchWuWkhwipnX5
-8wu6To12Mu2MnyLszX2QIUxrQme7UpKkJgCct60C1DZLoQuZmfEZEyXmSfJsizeq
-eeJuusZwOWDH0ixuFVK/5A2RwaWFMftdhh/Vw0EkxdQnMJ+7zJ/hbY64VR7uz8oI
-5smfjVe0yqXMACREUzXmqn+Dc6Pz6ESVTv2XwIy0UxqxiYk1J98Cf3ffi5+e/q1d
-rej2PzArpfzaygu88uMAAwUIAI/IiiQJupz9BaCws/K6j4Qs5iWRiSB7vaZfgCr9
-c6vx+mIXX1Pblity5TOn9qXMv7vUM/dgmWSBbkkrvfD++H4ybJjpcOZN+peeGd0G
-/UfiQFMarsj9MozAmhzI5L00JqLOf4u/XBv0rh5HOX6t+M9MfZYL3C7bn/LxmDif
-prT8jxoA2SC+lPGSzI+M+ay/mz8kDmGD7fCS+uAFo5T1kjU+ed2dhXnl16gRR8NO
-6yAdURIC+xs6P+7L8uOiZfuk0gzn5RC6CYrEKiGZf9VqTRA2vcirPNEZR44jYXS3
-nL7x9pIsHyCyxEvojut7iGWO6qbaW/c+MRjcA8jgp9OuFROIRgQYEQIABgUCNlle
-sAAKCRDuPE27/jtZzZksAKDbznARmDIIxZjHfAry2UJFBPQbvgCgl/ERQfF++Uvw
-hLaVfesP/NCIt5Y=
-=AoU9
+kuaoQVXeFycSULAPkV67j0/zDL2mis6bRpPopINGgjkia16u6LQnSnVuIEt1cml5
+YW1hIDxrdXJpeWFtYUBzMmZhY3RvcnkuY28uanA+iGIEExECACIFAk7YMm4CGyMG
+CwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEO48Tbv+O1nNcvwAnRR61t6HPGZ0
+rE2vxQnD8000iOBWAJ4qQzf8z2h4Al3jsxhEZu86pxinMbQkSnVuIEt1cml5YW1h
+IDxrdXJpeWFtYUBpbWdzcmMuY28uanA+iF8EExECABcFAjxN7RoFCwcKAwQDFQMC
+AxYCAQIXgAASCRDuPE27/jtZzQdlR1BHAAEBgV0An0EVyRKjj+tIx71SptEw8r7w
+VS6bAJ9gfWm3i3qMWW6UuT73BgD3AhIvd4hGBBMRAgAGBQI/al40AAoJEJWWFZ7O
+NWtZl18AoJAIWmYfHL289Vd36+0qy7PRm57cAJ4zQ0b/RyDnTDdX6q1Cu9mBP6sO
+UbQjSnVuIEt1cml5YW1hIDxrdXJpeWFtYUBGcmVlQlNELm9yZz6IXwQTEQIAFwUC
+OmRRlgULBwoDBAMVAwIDFgIBAheAABIJEO48Tbv+O1nNB2VHUEcAAQHj5gCgp5DO
+0Rxs8FttfsNkAc6wZkutnY0An1pYSgUYxPeR5AOO2NQj1zwgyH+XiEYEExECAAYF
+Aj9qXjkACgkQlZYVns41a1neWQCgpS6sWWPaQRsYBen7Vu1kiM1hQ8sAn3+WiZxg
+JRIyGULHOl6ErE1tjSVmtCZKdW4gS3VyaXlhbWEgPGt1cml5YW1hQGpwLkZyZWVC
+U0Qub3JnPohfBBMRAgAXBQI8TeyzBQsHCgMEAxUDAgMWAgECF4AAEgkQ7jxNu/47
+Wc0HZUdQRwABATKeAJ9tkRc3b/c3TS5XGPRizxclK54qogCfRfUYYnOqgWl8p5LD
+cOdQ6PnC1pGIRgQTEQIABgUCP2peOQAKCRCVlhWezjVrWWLRAKCUI6TdWbU9UOp0
+M3VbJ13tUUSU1QCfZrKLYvbV41McNjwmThio9yorpn20J0p1biBLdXJpeWFtYSA8
+a3VyaXlhbWFAczJmYWN0b3J5LmNvLmpwPohiBBMRAgAiBQJY2Qb+AhsjBgsJCAcD
+AgYVCAIJCgsEFgIDAQIeAQIXgAAKCRDuPE27/jtZzRLYAKDJHDuG84WOQIkY4naK
+XLecrfqd4QCeIc5dYiD9MajVrkjEFoTS+A83CXS5Ag0ENllesBAIAMSUhrKdEdKz
+QXHzkoE4Nzl3hb6dtDmjgYr+3X95wBkUvtrk2CeYG3RC1PNwd1sEFEWpIiSzOaQD
+zxZmtBGpMkQ1It+CW4sC5Cs2TQ59VHLFw7HWSYMNj+RchWuWkhwipnX58wu6To12
+Mu2MnyLszX2QIUxrQme7UpKkJgCct60C1DZLoQuZmfEZEyXmSfJsizeqeeJuusZw
+OWDH0ixuFVK/5A2RwaWFMftdhh/Vw0EkxdQnMJ+7zJ/hbY64VR7uz8oI5smfjVe0
+yqXMACREUzXmqn+Dc6Pz6ESVTv2XwIy0UxqxiYk1J98Cf3ffi5+e/q1drej2PzAr
+pfzaygu88uMAAwUIAI/IiiQJupz9BaCws/K6j4Qs5iWRiSB7vaZfgCr9c6vx+mIX
+X1Pblity5TOn9qXMv7vUM/dgmWSBbkkrvfD++H4ybJjpcOZN+peeGd0G/UfiQFMa
+rsj9MozAmhzI5L00JqLOf4u/XBv0rh5HOX6t+M9MfZYL3C7bn/LxmDifprT8jxoA
+2SC+lPGSzI+M+ay/mz8kDmGD7fCS+uAFo5T1kjU+ed2dhXnl16gRR8NO6yAdURIC
++xs6P+7L8uOiZfuk0gzn5RC6CYrEKiGZf9VqTRA2vcirPNEZR44jYXS3nL7x9pIs
+HyCyxEvojut7iGWO6qbaW/c+MRjcA8jgp9OuFROITgQYEQIABgUCNllesAASCRDu
+PE27/jtZzQdlR1BHAAEBmSwAoNvOcBGYMgjFmMd8CvLZQkUE9Bu+AKCX8RFB8X75
+S/CEtpV96w/80Ii3lpkCDQRY2QVyARAAqmqEonVURLiVroKceTL0jp/AOIatl6lz
+5q8CLKjjr4gIyhcE5swK9VFqBd/crHunTCEIzI8hrFMnWT9mPWIN3xTeRoUH3AOL
++leVdzZOed6K41BV7GgqHgLJapJeG8XO+epa4wVXWcrJyODcp4qucpQSn16f+gmn
+/t9m5QaYSzcXRz/xOz7NwAJBEVoLJheLojEoMevAELbS4PBX7SHrX/ZN8953yagR
+nhv35Qndu0gmBm+Hs/UR5UoMbFJu5dBwP20VkhVRcr77SGMgl2VWbTM4GH47Jf9U
+kfby4qLXbL2YF6hzj12DKuRVRXdUf9lSTgI+00QbAgXrytauzfPzfZKIJ5z9gpQY
+QhyH3UjnysLvhtGp6kA5JMxSJns8iSIYBhGsiyF45zIOWpXmvqOuLah6JD4s4Vy2
+pTnxtpj/ciLPSmbrjKxIfzqNeDs8YBYlzFzYGx0qtX1fupmNj/4CHEjOta2QEf7A
+mtoXyRXEZWHbmv0+Wwq3VewhKv/csOJclqOvlyj9skyXmvHG8k1O5c8oZL640XBH
+2qxuVtA1xhlLBfvi/3Gs3u/5mN66qyBh6USK0QD8FmqSG70ECNgNtLP2hka1pKoK
+MJnEx7lIbLHrvmljk0cQl1bQqKzYv8PvEb6vQUuYN1tRKnd3SxMgREJugsp+AIN7
+iXTyMc1HlW0AEQEAAbQkSnVuIEt1cml5YW1hIDxrdXJpeWFtYUBpbWdzcmMuY28u
+anA+iQI4BBMBAgAiBQJY2QX2AhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK
+CRBSSiRSYoJgD2xAD/9UaF9qCqYA4ZhUmslJPN8WsYKvow3Bv4RTVsLtrLTne7Si
+TZWYD/Lxin5/huUyl31oDHtgDR5wkPI1rA1zOJbDhKkHauF8HgQF0R4XFBeSLTCk
+A+Xx8w2eed5Kl1eE7uME7xxcbEI6yzejXz/1fzuCHycRAHBvwnp6Pt7WRRpslj+N
+hEsDB8M7eRrj99t+5nwWjAIMh05AboI5n6EaFftw7HDtsGmRJKSo2RMaVS6C4Jk4
+F1e46wuRp04n+E6NygoJA0hkr+A2588dwgPvkxRMscgN4HPInMH4St1wvl+JWpKI
+Ju3NC4qamwwVnaZctKPHev5ZL4zUFsATC9V4ch1vonUGclxiAHvbel9sarVJPPZG
+YYdUh8h6URQBX+5gcq3IIp1aR9ydueYcBTKtwPlOVHeoZhfDb2UUfmsJAZs0LwOS
+fVoELYiEUeJKuQkrpgwN6guP/MVgMWUFh8qcexbYuox3AkSt4rhih4SymBTS1qGs
+eynurXw4bFUp6gKc+EsqMEbzy/xyK4nFTwLwqQxZOHhSjP25I81RqZ1yRtIkDL8D
+O0egztObVg2YDr6+ZAwY3xZssSnDoi5z7g0Vv7qjsAk47FQfMgbqnhE+vQs3EbBg
+eVzWztd0M9+OO6RHET9PgIuMCz0YAEPoWsurC6C+wLHi98yFCWY1fjHbxdGHoohG
+BBARAgAGBQJY2QlnAAoJEO48Tbv+O1nNyiAAnRW+Wwh3zye4H1/GdA9uI7pwvPZH
+AJ9Nfx29aKa0vIutPwooZtCS5Osx6rQjSnVuIEt1cml5YW1hIDxrdXJpeWFtYUBG
+cmVlQlNELm9yZz6JAjgEEwECACIFAljZBXICGwMGCwkIBwMCBhUIAgkKCwQWAgMB
+Ah4BAheAAAoJEFJKJFJigmAPO/sQAJK96OM2gSFpML/GlJQfl7IigZQNVH/Qce02
+YsX33lO/eCkQPqSFdVc7daucC6IRS/mQ+ngOsrU5m7MDW//UDbtHiiWtjTiRazBW
+kDHnk9aJReWA9JWqw5OQy5iiasG3pY1E6bpgiXmZj/sXkEZ6y1pPh/s7HbY71C6+
+GEXWMvirruVNjdHIGfcZQB8sgXHkYZWXL+ipOt2GbxTGpROYkVG8gHz1IE2o6qDl
+5WSVVF95PY+Q+bsWhn1j5xskuYrNkV8H/M2T9qSsiyvTLPj3dN7cl5g3UTzyzFxQ
+5talRGa0mkB1H8xMxSHA97Ac6nI5uHAXDPK7VuJAkxqKY+Hgj7X2BaBtmCnfiTAg
+r8JqztfADFBD/WIeLS7RqfMUgs0bQNAioL3CtnjOz+pb27j04pKMXUI62cl/xF6N
+mAN7PpRw6bTSX+sjS4mg1asVqx8mbnpuwKE2pakI7EFyMn1NtlfsQhHrOrVirNUs
+pAQiMo8EENUhl2WjUITM5oW3U3rwh+kHZVs/veMa/Jwa0huK7JP2Foui/dvibpi8
+yxDQ5KqVER6fY5YDbZs0Qbc2CB1eajgm5I3V2ddbB/0IRGy7I2/kdbCE5dDxCTfz
+zWC4WQ6Wgv0UZaj1F8VSAJ5NJ2ib0N+7CwRGyQmKIm2SYhO2WvLreU4DmIhlhyWS
+TfxyPautiEYEEBECAAYFAljZCWcACgkQ7jxNu/47Wc0xPgCeIupKRuTuHUj/aGjz
+9pa1tGVgdOYAoKwyomUIx0ibiboxCI2y1xlmdYFytCdKdW4gS3VyaXlhbWEgPGt1
+cml5YW1hQHMyZmFjdG9yeS5jby5qcD6JAjgEEwECACIFAljZBeYCGwMGCwkIBwMC
+BhUIAgkKCwQWAgMBAh4BAheAAAoJEFJKJFJigmAPWucP/2fChp8o7ncu5Lak8+0n
+yEr8xPwwGz9oiXoP5d7E242iM4d7TVDn2V7BH6GT+VlSfJ9T+j4AzSPnpZWL2swE
+C5kI1SbcqNqmxFVsmrfqWgsQxrXhBxJlsL+xGyBYsFBIw4PkuVZ2IzMWuIVe0WID
+ajenEuRFeV6y77ZwG0qlCsBnLREFrXGeT725Jy51EAo4gAeepB4msG4YuLmQmSRO
+5GmKAInW+abivbjdBFYqmFwtyubfdpnDB9MM1Q/1jw16H1ymar/Zt17voXIjY6uP
+68p5fvzxg0xfZnlCFy0zS/blRksq+ESCLUaUmsSDF3/Jm4bivemWgbK0G523E0ar
+yKx7rLezj95ZDE7YiicKmZA8KLjo1o1ks1vHCOYCvu2GCvjgxLmYOeepQqQQCz6u
+25Dv7MZxjlkEGgbd6omBdHKvXrfSgXYugm30zM9VxnClF8lP06onwFu1Zp1ScYRz
+h04WoHUAFSJB1tjlppTLTIT9ODzYQOWenvon2o6Y+j1V3OMxf74bqa7za4VXP0VR
+Mq6bgl46aXIXxnvgeEAOgyfvGwr2HiaBACTMvYdmxczEDmMH4pd5o/hr5cJA8lTt
+q8fZQIBgZDOOjqkJH9JgZcoEaQTCx/EnaTD5n/uIynsNdyG7XP3hggEv2oQZiv84
+bqUisRp1MBKyq+yGlOnnbXR8iEYEEBECAAYFAljZCWcACgkQ7jxNu/47Wc16bwCe
+PoutK/wifl95P8fwyjArrTu0H6IAoJ/tbyVn/nGB7IgKijnoICZz8kcnuQINBFjZ
+BXIBEADnJcTQXD+XIkUvwpdzKUOArhbXPos98StzInaOgGhnEdaa8zLTry4608Re
+CcNkNDW2p0JBZ1EzgP3gOBy0qoHyFwfqhSmD8jlIxGUiK4p4OcL/1/O25CA+69Mq
+Sdn6OKIdg9bQYq0c8xypT3hRlpTvBWJJr6y4AsztoNaMqzsP7t3cUFlU7j0+NjP4
+zXr9yn1mfDFlEkRnvcPhbNz1qDFrxoSwD0asQ8pWhgi0g6kP5GgQJlXsb1JZQWz8
+E5syfM1Izp7FgmSTMLYZFA3uzjUi2u4J6wCWDGRqRDX2xCjXFaV3MCt0JAqET35k
+5rLJzWm8wg7ATcKImcGLm/96OVfXkLay5Mnipc9Vr9m7IWsrYwjgOgVeW2SL9CvY
+D6GmUzM+n/V6sLsQZ1J7Ltxt3pBnDvDrkZ3Qq+Ru99kVRqGZUS/VU2ebx38othh3
+GbqajOcxbfPxWALm/tkx7nXS9eqHzlh8CJvraVc7kMiCgEAMFt/j9tMpuX8LY9ZB
+uc3IEzfU+b4P7/jDdsld9Wdc4CuMpy634ogGxMOpNcKetjAAttg78Z1mliy7J3cZ
+nTL3XWrWIH4zV0IOEt10Ztop63rPhotW0kGyvXSfaOV8TvyTtpmefpwaUc01XqON
+81y5+Y/mrJyA0Lh0yAoXYa4wSKCZ74ohTE3yfvYrBl4huRrdaQARAQABiQIfBBgB
+AgAJBQJY2QVyAhsMAAoJEFJKJFJigmAP2XQP/0SNY+aSEwfmsAlkt66P4VMki1UM
+ZyVrp7poTfqUlN7eWZXBGZK4pug3F3ZqSi7ASqEnC8o72a30I9KKHkG4ATqGEIx7
+Oh5ZuIy3m/AIKY4Espg5yxjxdZ/AwiuYouuMBmYBouZxXDJ5LxkSMvZ+FxGknI/V
+HYol2qcdOTiO8OGWUvVWR/x78K8L04MHxI+kktGCeqxMhYHaT2J//RXBxCKD2gac
+HqYjHgHAqaBGt5yYBiXjdH0NKyaIYeb532IN+mmy2dlP4Bn6V8A3b4yaSf/OX+bt
+/NwfWQvt/GkS3KC+LIrC/Y3Z+L9u6G8TFOint4GY/Wo839JL/a6q6hSJdsuNGRoG
+dDC1iBPTu1f3cXw4Pw2WMie8zgRTbFe3Kx2Pl5Ifav0MCYAEbeE8NMyBSjjpPUfb
+BpfqoYv5dsrTvX7EG4IIM1KPozUcj9KAM2gakP7W8CTM6IraIuGuYwM9HyLXZrfc
+gYtY7lmg8gJljtl9Cr0BXYyQcAYVHVJCqsfdG/QoZrSWuqCVLGC6KlHS/6J3Agtf
+EyLAMbYetNoybucbx5fnn9EfLZFwHp0Am0Ipnx4DVTqAfZ5Xzf3XNpfZdwVinvmI
+TUq4De6yG2NztCBzFortFeLkTCWWJJBgIZvj2VaQhA9GXmW8ppm2HJgoHk32L1vC
+5YX2uFny/3XmW1wA
+=R3VC
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>