diff --git a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
index 7e8a8ea0ad..0c02584ae3 100644
--- a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
@@ -1,424 +1,429 @@
 <!--
      The FreeBSD Documentation Project
 
      $FreeBSD$
 -->
 <!--
 
   Do not edit this file except as instructed by the addkey.sh script.
 
   See the README file in this directory for instructions.
 
 -->
 <appendix id="pgpkeys">
   <title>PGP Keys</title>
   
   <indexterm><primary>pgp keys</primary></indexterm>
   <para>In case you need to verify a signature or send encrypted email
     to one of the officers or developers a number of keys are provided
     here for your convenience.  A complete keyring of FreeBSD.org
     users is available for download from <ulink url="../../../../doc/pgpkeyring.txt">http://www.FreeBSD.org/doc/pgpkeyring.txt</ulink>.</para>
   
   <sect1 id="pgpkeys-officers">
     <title>Officers</title>
     
     <sect2>
       <title>FreeBSD Security Officer
 	<email>security-officer@FreeBSD.org</email></title>
       &pgpkey.security-officer;
     </sect2>
 
     <sect2>
       <title>FreeBSD core secretary
 	<email>core-secretary@FreeBSD.org</email></title>
       &pgpkey.core-secretary;
     </sect2>
 
   </sect1>
   
   <sect1 id="pgpkeys-core">
     <title>Core Team Members</title>
 
     <sect2>
       <title>&a.jkh;</title>
       &pgpkey.jkh;      
     </sect2>
     
     <sect2>
       <title>&a.imp;</title>
       &pgpkey.imp;      
     </sect2>
     
     <sect2>
       <title>&a.peter;</title>
       &pgpkey.peter;      
     </sect2>
     
     <sect2>
       <title>&a.dfr;</title>
       &pgpkey.dfr;      
     </sect2>
     
   </sect1>
   
   <sect1 id="pgpkeys-developers">
     <title>Developers</title>
 
     <sect2>
       <title>&a.will;</title>
       &pgpkey.will;
     </sect2>
 
     <sect2>
       <title>&a.asami;</title>
       &pgpkey.asami;
     </sect2>
 
     <sect2>
       <title>&a.tobez;</title>
       &pgpkey.tobez;      
     </sect2>
 
     <sect2>
       <title>&a.mbr;</title>
       &pgpkey.mbr;
     </sect2>
 
     <sect2>
       <title>&a.jmb;</title>
       &pgpkey.jmb;
     </sect2>
     
     <sect2>
       <title>&a.wilko;</title>
       &pgpkey.wilko;
     </sect2>
 
     <sect2>
       <title>&a.ache;</title>
       &pgpkey.ache;
     </sect2>
 
     <sect2>
       <title>&a.cjc;</title>
       &pgpkey.cjc;
     </sect2>
 
     <sect2>
       <title>&a.nik;</title>
       &pgpkey.nik;
     </sect2>
 
     <sect2>
       <title>&a.brooks;</title>
       &pgpkey.brooks;
     </sect2>
 
     <sect2>
       <title>&a.bsd;</title>
       &pgpkey.bsd;
     </sect2>
 
     <sect2>
       <title>&a.dd;</title>
       &pgpkey.dd;
     </sect2>
 
     <sect2>
       <title>&a.ue;</title>
       &pgpkey.ue;
     </sect2>
 
     <sect2>
       <title>&a.jedgar;</title>
       &pgpkey.jedgar;
     </sect2>
     
     <sect2>
       <title>&a.green;</title>
       &pgpkey.green;
     </sect2>
 
     <sect2>
       <title>&a.lioux;</title>
       &pgpkey.lioux;
     </sect2>
 
     <sect2>
       <title>&a.petef;</title>
       &pgpkey.petef;
     </sect2>
 
     <sect2>
       <title>&a.patrick;</title>
       &pgpkey.patrick;
     </sect2>
     
     <sect2>
       <title>&a.jmg;</title>
       &pgpkey.jmg;
     </sect2>
 
     <sect2>
       <title>&a.dannyboy;</title>
       &pgpkey.dannyboy;
     </sect2>
 
     <sect2>
       <title>&a.jhay;</title>
       &pgpkey.jhay;
     </sect2>
 
     <sect2>
       <title>&a.mikeh;</title>
       &pgpkey.mikeh;
     </sect2>
 
     <sect2>
       <title>&a.ghelmer;</title>
       &pgpkey.ghelmer;
     </sect2>
 
     <sect2>
       <title>&a.trevor;</title>
       &pgpkey.trevor;
     </sect2>
 
     <sect2>
       <title>&a.phk;</title>
       &pgpkey.phk;
     </sect2>
     
     <sect2>
       <title>&a.joe;</title>
       &pgpkey.joe;
     </sect2>
 
     <sect2>
       <title>&a.kris;</title>
       &pgpkey.kris;
     </sect2>
 
     <sect2>
       <title>&a.keramida;</title>
       &pgpkey.keramida;
     </sect2>
  
     <sect2>
       <title>&a.fjoe;</title>
       &pgpkey.fjoe;
     </sect2>
     	
     <sect2>
       <title>&a.andreas;</title>
       &pgpkey.andreas;
     </sect2>
 
     <sect2>
       <title>&a.jkoshy;</title>
       &pgpkey.jkoshy;
     </sect2>
 
+    <sect2>
+      <title>&a.kuriyama;</title>
+      &pgpkey.kuriyama;
+    </sect2>
+
     <sect2>
       <title>&a.alex;</title>
       &pgpkey.alex;
     </sect2>
 
     <sect2>
       <title>&a.ijliao;</title>
       &pgpkey.ijliao;
     </sect2>
 
     <sect2>
       <title>&a.clive;</title>
       &pgpkey.clive;
     </sect2>
 
     <sect2>
       <title>&a.bmah;</title>
       &pgpkey.bmah;
     </sect2>
 
     <sect2>
       <title>&a.matusita;</title>
       &pgpkey.matusita;
     </sect2>
 
     <sect2>
       <title>&a.ken;</title>
       &pgpkey.ken;
     </sect2>
 
     <sect2>
       <title>&a.dinoex;</title>
       &pgpkey.dinoex;
     </sect2>
 
     <sect2>
       <title>&a.jim;</title>
       &pgpkey.jim;
     </sect2>
 
     <sect2>
       <title>&a.tmm;</title>
       &pgpkey.tmm;
     </sect2>
 
     <sect2>
       <title>&a.rich;</title>
       &pgpkey.rich;
     </sect2>
     
     <sect2>
       <title>&a.knu;</title>
       &pgpkey.knu;
     </sect2>
     
     <sect2>
       <title>&a.max;</title>
       &pgpkey.max;
     </sect2>
 
     <sect2>
       <title>&a.anders;</title>
       &pgpkey.anders;
     </sect2>
     
     <sect2>
       <title>&a.obrien;</title>
       &pgpkey.obrien;
     </sect2>
 
     <sect2>
       <title>&a.pirzyk;</title>
       &pgpkey.pirzyk;
     </sect2>
 
     <sect2>
       <title>&a.jdp;</title>
       &pgpkey.jdp;
     </sect2>
     
     <sect2>
       <title>&a.markp;</title>
       &pgpkey.markp;
     </sect2>
 
     <sect2>
       <title>&a.benno;</title>
       &pgpkey.benno;
     </sect2>
 
     <sect2>
       <title>&a.roberto;</title>
       &pgpkey.roberto;
     </sect2>
 
     <sect2>
       <title>&a.guido;</title>
       &pgpkey.guido;
     </sect2>
 
     <sect2>
       <title>&a.wosch;</title>
       &pgpkey.wosch;
     </sect2>
 
     <sect2>
       <title>&a.schweikh;</title>
       &pgpkey.schweikh;
     </sect2>
 
     <sect2>
       <title>&a.gshapiro;</title>
       &pgpkey.gshapiro;
     </sect2>
 
     <sect2>
       <title>&a.vanilla;</title>
       &pgpkey.vanilla;
     </sect2>
 
     <sect2>
       <title>&a.cshumway;</title>
       &pgpkey.cshumway;
     </sect2>
 
     <sect2>
       <title>&a.demon;</title>
       &pgpkey.demon;
     </sect2>
 
     <sect2>
       <title>&a.jesper;</title>
       &pgpkey.jesper;
     </sect2>
 
     <sect2>
       <title>&a.ben;</title>
       &pgpkey.ben;
     </sect2>
 
     <sect2>
       <title>&a.des;</title>
       &pgpkey.des;
     </sect2>
     
     <sect2>
       <title>&a.sobomax;</title>
       &pgpkey.sobomax;
     </sect2>
     
     <sect2>
       <title>&a.dcs;</title>
       &pgpkey.dcs;
     </sect2>
 
     <sect2>
       <title>&a.brian;</title>
       &pgpkey.brian;
     </sect2>
 
     <sect2>
       <title>&a.murray;</title>
       &pgpkey.murray;
     </sect2>
 
     <sect2>
       <title>&a.gsutter;</title>
       &pgpkey.gsutter;
     </sect2>
 
     <sect2>
       <title>&a.mi;</title>
       &pgpkey.mi;
     </sect2>
 
     <sect2>
       <title>&a.nectar;</title>
       &pgpkey.nectar;
     </sect2>
 
     <sect2>
       <title>&a.wollman;</title>
       &pgpkey.wollman;
     </sect2>
 
     <sect2>
       <title>&a.joerg;</title>
       &pgpkey.joerg;
     </sect2>
 
   </sect1>
 </appendix>
 
 <!-- 
      Local Variables:
      mode: sgml
      sgml-declaration: "../appendix.decl"
      sgml-indent-data: t
      sgml-omittag: nil
      sgml-always-quote-attributes: t
      sgml-parent-document: ("../book.sgml" "part" "appendix")
      End:
 -->
diff --git a/en_US.ISO8859-1/books/handbook/pgpkeys/kuriyama.key b/en_US.ISO8859-1/books/handbook/pgpkeys/kuriyama.key
new file mode 100644
index 0000000000..cf72d7355a
--- /dev/null
+++ b/en_US.ISO8859-1/books/handbook/pgpkeys/kuriyama.key
@@ -0,0 +1,49 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh kuriyama FE3B59CD;
+-->
+<programlisting><![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
+]]></programlisting>
+<programlisting 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
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent b/en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent
index f7d21f8e5e..301d7833ed 100644
--- a/en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent
+++ b/en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent
@@ -1,76 +1,77 @@
 <!-- $FreeBSD$ -->
 <!ENTITY pgpkey.ache SYSTEM "ache.key">
 <!ENTITY pgpkey.alex SYSTEM "alex.key">
 <!ENTITY pgpkey.anders SYSTEM "anders.key">
 <!ENTITY pgpkey.andreas SYSTEM "andreas.key">
 <!ENTITY pgpkey.asami SYSTEM "asami.key">
 <!ENTITY pgpkey.ben SYSTEM "ben.key">
 <!ENTITY pgpkey.benno SYSTEM "benno.key">
 <!ENTITY pgpkey.bmah SYSTEM "bmah.key">
 <!ENTITY pgpkey.brian SYSTEM "brian.key">
 <!ENTITY pgpkey.brooks SYSTEM "brooks.key">
 <!ENTITY pgpkey.bsd SYSTEM "bsd.key">
 <!ENTITY pgpkey.cjc SYSTEM "cjc.key">
 <!ENTITY pgpkey.clive SYSTEM "clive.key">
 <!ENTITY pgpkey.core-secretary SYSTEM "core-secretary.key">
 <!ENTITY pgpkey.cshumway SYSTEM "cshumway.key">
 <!ENTITY pgpkey.dannyboy SYSTEM "dannyboy.key">
 <!ENTITY pgpkey.dcs SYSTEM "dcs.key">
 <!ENTITY pgpkey.dd SYSTEM "dd.key">
 <!ENTITY pgpkey.demon SYSTEM "demon.key">
 <!ENTITY pgpkey.des SYSTEM "des.key">
 <!ENTITY pgpkey.dfr SYSTEM "dfr.key">
 <!ENTITY pgpkey.dinoex SYSTEM "dinoex.key">
 <!ENTITY pgpkey.fjoe SYSTEM "fjoe.key">
 <!ENTITY pgpkey.ghelmer SYSTEM "ghelmer.key">
 <!ENTITY pgpkey.green SYSTEM "green.key">
 <!ENTITY pgpkey.gshapiro SYSTEM "gshapiro.key">
 <!ENTITY pgpkey.gsutter SYSTEM "gsutter.key">
 <!ENTITY pgpkey.guido SYSTEM "guido.key">
 <!ENTITY pgpkey.ijliao SYSTEM "ijliao.key">
 <!ENTITY pgpkey.imp SYSTEM "imp.key">
 <!ENTITY pgpkey.jdp SYSTEM "jdp.key">
 <!ENTITY pgpkey.jedgar SYSTEM "jedgar.key">
 <!ENTITY pgpkey.jesper SYSTEM "jesper.key">
 <!ENTITY pgpkey.jhay SYSTEM "jhay.key">
 <!ENTITY pgpkey.jim SYSTEM "jim.key">
 <!ENTITY pgpkey.jkh SYSTEM "jkh.key">
 <!ENTITY pgpkey.jkoshy SYSTEM "jkoshy.key">
 <!ENTITY pgpkey.jmb SYSTEM "jmb.key">
 <!ENTITY pgpkey.jmg SYSTEM "jmg.key">
 <!ENTITY pgpkey.joe SYSTEM "joe.key">
 <!ENTITY pgpkey.joerg SYSTEM "joerg.key">
 <!ENTITY pgpkey.ken SYSTEM "ken.key">
 <!ENTITY pgpkey.keramida SYSTEM "keramida.key">
 <!ENTITY pgpkey.knu SYSTEM "knu.key">
 <!ENTITY pgpkey.kris SYSTEM "kris.key">
+<!ENTITY pgpkey.kuriyama SYSTEM "kuriyama.key">
 <!ENTITY pgpkey.lioux SYSTEM "lioux.key">
 <!ENTITY pgpkey.markp SYSTEM "markp.key">
 <!ENTITY pgpkey.matusita SYSTEM "matusita.key">
 <!ENTITY pgpkey.max SYSTEM "max.key">
 <!ENTITY pgpkey.mbr SYSTEM "mbr.key">
 <!ENTITY pgpkey.mi SYSTEM "mi.key">
 <!ENTITY pgpkey.mikeh SYSTEM "mikeh.key">
 <!ENTITY pgpkey.murray SYSTEM "murray.key">
 <!ENTITY pgpkey.nectar SYSTEM "nectar.key">
 <!ENTITY pgpkey.nik SYSTEM "nik.key">
 <!ENTITY pgpkey.obrien SYSTEM "obrien.key">
 <!ENTITY pgpkey.patrick SYSTEM "patrick.key">
 <!ENTITY pgpkey.petef SYSTEM "petef.key">
 <!ENTITY pgpkey.peter SYSTEM "peter.key">
 <!ENTITY pgpkey.phk SYSTEM "phk.key">
 <!ENTITY pgpkey.pirzyk SYSTEM "pirzyk.key">
 <!ENTITY pgpkey.rich SYSTEM "rich.key">
 <!ENTITY pgpkey.roberto SYSTEM "roberto.key">
 <!ENTITY pgpkey.schweikh SYSTEM "schweikh.key">
 <!ENTITY pgpkey.security-officer SYSTEM "security-officer.key">
 <!ENTITY pgpkey.sobomax SYSTEM "sobomax.key">
 <!ENTITY pgpkey.tmm SYSTEM "tmm.key">
 <!ENTITY pgpkey.tobez SYSTEM "tobez.key">
 <!ENTITY pgpkey.trevor SYSTEM "trevor.key">
 <!ENTITY pgpkey.ue SYSTEM "ue.key">
 <!ENTITY pgpkey.vanilla SYSTEM "vanilla.key">
 <!ENTITY pgpkey.wilko SYSTEM "wilko.key">
 <!ENTITY pgpkey.will SYSTEM "will.key">
 <!ENTITY pgpkey.wollman SYSTEM "wollman.key">
 <!ENTITY pgpkey.wosch SYSTEM "wosch.key">