diff --git a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
index f1ae378c48..d2881ddf28 100644
--- a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
@@ -1,362 +1,368 @@
 <!--
      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.ache;</title>
       &pgpkey.ache;
     </sect2>
 
     <sect2>
       <title>&a.nik;</title>
       &pgpkey.nik;
     </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.patrick;</title>
       &pgpkey.patrick;
     </sect2>
     
     <sect2>
       <title>&a.lioux;</title>
       &pgpkey.lioux;
     </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.andreas;</title>
       &pgpkey.andreas;
     </sect2>
 
     <sect2>
       <title>&a.jkoshy;</title>
       &pgpkey.jkoshy;
     </sect2>
 
     <sect2>
       <title>&a.bmah;</title>
       &pgpkey.bmah;
     </sect2>
 
     <sect2>
       <title>&a.matusita;</title>
       &pgpkey.matusita;
     </sect2>
 
     <sect2>
       <title>&a.dinoex;</title>
       &pgpkey.dinoex;
     </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.gshapiro;</title>
       &pgpkey.gshapiro;
     </sect2>
 
     <sect2>
       <title>&a.cshumway;</title>
       &pgpkey.cshumway;
     </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>
+
     <sect2>
       <title>&a.wilko;</title>
       &pgpkey.wilko;
     </sect2>
 
+    <sect2>
+      <title>&a.fjoe;</title>
+      &pgpkey.fjoe;
+    </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/fjoe.key b/en_US.ISO8859-1/books/handbook/pgpkeys/fjoe.key
new file mode 100644
index 0000000000..90a873f850
--- /dev/null
+++ b/en_US.ISO8859-1/books/handbook/pgpkeys/fjoe.key
@@ -0,0 +1,39 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh fjoe 971D4357;
+-->
+<programlisting><![CDATA[
+pub  1024D/971D4357 2002-01-22 Max Khon <fjoe@iclub.nsu.ru>
+     Key fingerprint = AAC1 B2AF 9438 0D33 C106  C551 4052 219C 971D 4357
+uid                            Max Khon <fjoe@freebsd.org>
+sub  1024g/DAA2638B 2002-01-22
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.0.6 (FreeBSD)
+Comment: For info see http://www.gnupg.org
+
+mQGiBDxNv74RBACfS4pslvVvIc982zb8DPxz3tIsL9UBYaD3UL8XP5WcxvM6/dtb
+Unaj1RP4GwgY+Q04DPaN1kegfkO747q6Me3pAYzrbsEn9/IVKjbj4b3MUBnhS5zJ
+9UraGJGK1rSbrEpE0FlPMxNYnT+c3aU2Eak+SaR3TE0Idspb/v+V03DUSwCgy1v1
+7MO5ot1DMOoyM6A5P8aLd6cD/R3Ty99bm06HimZ9TdFz0kMDTAFu95qRqiJLQflP
+VozcTkTZJovWrhzpDiXDBITv0q9C53+X2DzY7z4eohuK5pBjDf19B/htXylbgi4+
+CeHv0FDtFNn3Vm3kc87LH6K/dnf07VozUqff0LNUs9bzVLNclcwc/Mette5QZecs
+iADcA/4rsJ4Q8MA0QgD3gFAd4LaYBipprtdTIeG5hkTQ8kmmjvoEPa3ZmL7iWaCY
+p3XJwU43ZyotC33btztA17W4rmhIS8Ftn3mSJGLAyNHxAk0tyxAzbeR9Gev5ZKQD
+acIdVoBlozcAmedRaz784leNsGF+g9ASuF1yks2E2HBNvd77B7QbTWF4IEtob24g
+PGZqb2VAZnJlZWJzZC5vcmc+iFcEExECABcFAjxNv74FCwcKAwQDFQMCAxYCAQIX
+gAAKCRBAUiGclx1DV9gwAKCd/f5VJ6IWbuOVDBoFAsETIs58DwCglfhk5asT0CG+
+dltWhw8bWrzOl4q0HE1heCBLaG9uIDxmam9lQGljbHViLm5zdS5ydT6IVwQTEQIA
+FwUCPE3DngULBwoDBAMVAwIDFgIBAheAAAoJEEBSIZyXHUNXjo8AnjqrFvnNU20Y
+U65jlH79q0S8viuOAJwPVoe/fZGkid4pEQRmL3v3zQ8Od7kBDQQ8Tb/IEAQApGvP
+YdvjyqgP1edMpaGfO1VtEoN0g1xKFJJwMZgJyM8Kl0Y+WuZrGf/YvUO5sF2A4cx8
+hgQVGJ4WIvSraSSnof+YpQJMpZbYpsxKA+a76CFs9cTcdyfwaYRWWJVorx4xNZB+
+9Xtbho5b1iIM1gYQF9a5AMeUrcNByw0tVgTF6G8AAwUD/0WGlUes4/u+TSrt3BIf
+9XVgAI1QPP42v1kcm9VJpBLNol0Kd2Jo8q7UkC/EwJHl/ipEJZQCBfaa7AtUDqnS
+aRDKr/49K19J8YV8G/fUWjcw9SSoXGDYLhcmFZ/i9WQe+pA6+zSbjEui5kn3wq0o
+RFVl1WpkG/znTfWmfQZio8tLiEYEGBECAAYFAjxNv8gACgkQQFIhnJcdQ1f3xQCg
+juJUbh12EfQAiCMm06Eqt9xjWpwAoIqLZ2pe8O8FRZ9Dzcd0oHgUT6ol
+=b6kO
+-----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 77ed5b728e..348ddb31c8 100644
--- a/en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent
+++ b/en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent
@@ -1,64 +1,65 @@
 <!-- $FreeBSD$ -->
 <!ENTITY pgpkey.ache SYSTEM "ache.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.bsd SYSTEM "bsd.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.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.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.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.keramida SYSTEM "keramida.key">
 <!ENTITY pgpkey.knu SYSTEM "knu.key">
 <!ENTITY pgpkey.kris SYSTEM "kris.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.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.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.wilko SYSTEM "wilko.key">
 <!ENTITY pgpkey.will SYSTEM "will.key">
 <!ENTITY pgpkey.wollman SYSTEM "wollman.key">
 <!ENTITY pgpkey.wosch SYSTEM "wosch.key">