diff --git a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
index 3e1679363e..0523eee5c4 100644
--- a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
@@ -1,518 +1,523 @@
 <!--
      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>&a.security-officer;</title>
       &pgpkey.security-officer;
     </sect2>
 
     <sect2>
       <title>&a.core-secretary;</title>
       &pgpkey.core-secretary;
     </sect2>
 
   </sect1>
   
   <sect1 id="pgpkeys-core">
     <title>Core Team Members</title>
 
     <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.luoqi;</title>
       &pgpkey.luoqi;
     </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.ru;</title>
       &pgpkey.ru;
     </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.fanf;</title>
       &pgpkey.fanf;
     </sect2>
 
     <sect2>
       <title>&a.petef;</title>
       &pgpkey.petef;
     </sect2>
 
     <sect2>
       <title>&a.billf;</title>
       &pgpkey.billf;
     </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.sheldonh;</title>
+      &pgpkey.sheldonh;
+    </sect2>
+
     <sect2>
       <title>&a.mikeh;</title>
       &pgpkey.mikeh;
     </sect2>
 
     <sect2>
       <title>&a.ghelmer;</title>
       &pgpkey.ghelmer;
     </sect2>
 
     <sect2>
       <title>&a.mux;</title>
       &pgpkey.mux;
     </sect2>
 
     <sect2>
       <title>&a.jkh;</title>
       &pgpkey.jkh;      
     </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.netchild;</title>
       &pgpkey.netchild;
     </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.dwmalone;</title>
       &pgpkey.dwmalone;
     </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.sanpei;</title>
       &pgpkey.sanpei;
     </sect2>
 
     <sect2>
       <title>&a.jim;</title>
       &pgpkey.jim;
     </sect2>
 
     <sect2>
       <title>&a.marcel;</title>
       &pgpkey.marcel;
     </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.mp;</title>
       &pgpkey.mp;
     </sect2>
 
     <sect2>
       <title>&a.roam;</title>
       &pgpkey.roam;
     </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.scop;</title>
       &pgpkey.scop;
     </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.nyan;</title>
       &pgpkey.nyan;
     </sect2>
 
     <sect2>
       <title>&a.mi;</title>
       &pgpkey.mi;
     </sect2>
 
     <sect2>
       <title>&a.gordon;</title>
       &pgpkey.gordon;
     </sect2>
 
     <sect2>
       <title>&a.nectar;</title>
       &pgpkey.nectar;
     </sect2>
 
     <sect2>
       <title>&a.nate;</title>
       &pgpkey.nate;
     </sect2>
 
     <sect2>
       <title>&a.wollman;</title>
       &pgpkey.wollman;
     </sect2>
 
     <sect2>
       <title>&a.joerg;</title>
       &pgpkey.joerg;
     </sect2>
 
     <sect2>
       <title>&a.phantom;</title>
       &pgpkey.phantom;
     </sect2>
 
     <sect2>
       <title>&a.nsouch;</title>
       &pgpkey.nsouch;
     </sect2>
 
     <sect2>
       <title>&a.gioria;</title>
       &pgpkey.gioria;
     </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/pgpkeys.ent b/en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent
index 5fe34085cc..74c6d4c2f1 100644
--- a/en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent
+++ b/en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent
@@ -1,96 +1,97 @@
 <!-- $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.billf SYSTEM "billf.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.dwmalone SYSTEM "dwmalone.key">
 <!ENTITY pgpkey.fanf SYSTEM "fanf.key">
 <!ENTITY pgpkey.fjoe SYSTEM "fjoe.key">
 <!ENTITY pgpkey.ghelmer SYSTEM "ghelmer.key">
 <!ENTITY pgpkey.gioria SYSTEM "gioria.key">
 <!ENTITY pgpkey.gordon SYSTEM "gordon.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.luoqi SYSTEM "luoqi.key">
 <!ENTITY pgpkey.marcel SYSTEM "marcel.key">
 <!ENTITY pgpkey.marcus SYSTEM "marcus.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.mp SYSTEM "mp.key">
 <!ENTITY pgpkey.murray SYSTEM "murray.key">
 <!ENTITY pgpkey.mux SYSTEM "mux.key">
 <!ENTITY pgpkey.nate SYSTEM "nate.key">
 <!ENTITY pgpkey.nectar SYSTEM "nectar.key">
 <!ENTITY pgpkey.netchild SYSTEM "netchild.key">
 <!ENTITY pgpkey.nik SYSTEM "nik.key">
 <!ENTITY pgpkey.nsouch SYSTEM "nsouch.key">
 <!ENTITY pgpkey.nyan SYSTEM "nyan.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.phantom SYSTEM "phantom.key">
 <!ENTITY pgpkey.phk SYSTEM "phk.key">
 <!ENTITY pgpkey.pirzyk SYSTEM "pirzyk.key">
 <!ENTITY pgpkey.rich SYSTEM "rich.key">
 <!ENTITY pgpkey.roam SYSTEM "roam.key">
 <!ENTITY pgpkey.roberto SYSTEM "roberto.key">
 <!ENTITY pgpkey.ru SYSTEM "ru.key">
 <!ENTITY pgpkey.sanpei SYSTEM "sanpei.key">
 <!ENTITY pgpkey.schweikh SYSTEM "schweikh.key">
 <!ENTITY pgpkey.scop SYSTEM "scop.key">
 <!ENTITY pgpkey.security-officer SYSTEM "security-officer.key">
+<!ENTITY pgpkey.sheldonh SYSTEM "sheldonh.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">
diff --git a/en_US.ISO8859-1/books/handbook/pgpkeys/sheldonh.key b/en_US.ISO8859-1/books/handbook/pgpkeys/sheldonh.key
new file mode 100644
index 0000000000..f06c82ea8f
--- /dev/null
+++ b/en_US.ISO8859-1/books/handbook/pgpkeys/sheldonh.key
@@ -0,0 +1,39 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh Sheldon Hearn <sheldonh@starjuice.net> 74A06ACD;
+-->
+<programlisting><![CDATA[
+pub  1024D/74A06ACD 2002-06-20 Sheldon Hearn <sheldonh@starjuice.net>
+     Key fingerprint = 01A3 EF91 9C5A 3633 4E01  8085 A462 57F1 74A0 6ACD
+sub  1536g/C42F8AC8 2002-06-20
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.0.6 (FreeBSD)
+Comment: For info see http://www.gnupg.org
+
+mQGiBD0R0hQRBACPEDZc2XKdvIq9F4ofeq/EUB8ISFQ6kaVPcb5ingy5ND+0MUbz
+K9U+q6Ik8d67KfHHvqGn7XTOXxGu2WS6rIa4ElFHtG/9lpgYtOFRZJxM8nv5+zCn
+elu18skUNup1y3uIwvhNUY3OPSzVkHC+tUPWfW/8DqdJzud/l8sDFDRtBwCgtixB
+FHJ2jRXInApVzwLcjpgVJq8D/ixzt0O/Zg2p62/qyAHac7M1sEc2QarCAGwRbuNw
+jHRtglxQw/GT2NACWqy7lVHKd37ciCrXg9QrTjotJtMcoJbCitYvbQo2RHfEeIyN
+yw7rffTQ4CpB51KxNhUWHcUfe6Jhx2hgHzehJg7hYnbtSv5hJcn2DXMSHHyHwBri
+hpldBACI7iJxl2MtFUHBo3XW27WYDzTNTh2LUaMcIaowMW/+vIDds6EI71dCAjuU
+Ai8DcNacMtE0xRdtNzDMS8vgYWBVLkHv2ENVdLfpxhM72iu4tmPKGF5AXK191dvJ
+qPge41Z2/57191Xt+keYtuSQDtXwZfSu1uLOHBa0BBvmppBOtrQmU2hlbGRvbiBI
+ZWFybiA8c2hlbGRvbmhAc3Rhcmp1aWNlLm5ldD6IVwQTEQIAFwUCPRHSFAULBwoD
+BAMVAwIDFgIBAheAAAoJEKRiV/F0oGrNMRsAnAlWdC5LkmEF3hZjNAIA8gMxkfnZ
+AJ4k6LXdmHMSSPbd48MbDYq67yzOG7kBjQQ9EdIrEAYAib54xuFqjHpvLxXmqFRl
+qAgAD5XpavuJisxGjfm7aTVWIpR/OOVFYkW59YInHM7dDHL0Y7tQETeEKf9pj6kF
+TMyWFoBjtdazqSmq2YXOvI00N27IKT9eqxJ/qR8QgIqBMNkraP9QKi60ASDIRUtl
+OZSfokSbAKkZMTyS086CgWw0bCPXRCvQLHDjga3KCbht0AjrZFkGmi6r4+rXFnT6
+D3JrNSQ0Hj2qFEixHtZvXTsqgsEkOEtoe5taMFSygM0jAAMFBf97Ip2a/kPkXNt0
+p+2xmWIFEDim7J9Cwl5viTb1t8fOKx69hFDQ2BwPNDZd1HvlrYTpuJ23uTrDOZsw
+IT/wVc/IQ9nn4+mkxOmq9iTHCBS99OXz4IsODT3W1sgzUfl+mdqJP8xfEnsyqy6G
+ivOoR3QdZg7rxvOU98HhDQ1iJX3rCtLNFGisrovDF33oHMEE4oHvSMXeg65JXWiU
+EpEpioINjrA3P+TL+fMv1tb4+wSUPqTWX34Gx4UfDKnMedxl6j2IRgQYEQIABgUC
+PRHSKwAKCRCkYlfxdKBqzVtaAJ42mqzwmJCpk8fdsfkHUt5uGTN8sgCfdmDni1OD
+NWQi1mhQOXZX9oGgyso=
+=PTeT
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>