diff --git a/ja_JP.eucJP/books/handbook/book.sgml b/ja_JP.eucJP/books/handbook/book.sgml
index 567a1f268e..97532fde19 100644
--- a/ja_JP.eucJP/books/handbook/book.sgml
+++ b/ja_JP.eucJP/books/handbook/book.sgml
@@ -22,6 +22,8 @@
 %ja-authors;
 <!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
 %authors;
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+%teams;
 <!ENTITY % ja-mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA">
 %ja-mailing-lists;
 <!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"> %newsgroups;
diff --git a/ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml b/ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml
index 8e7a8181db..5eaad869c7 100644
--- a/ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.149
+     Original revision: 1.162
      $FreeBSD$
 -->
 
@@ -22,14 +22,12 @@
     <title>���ե���</title>
     
     <sect2>
-      <title>FreeBSD Security Officer
-	<email>security-officer@FreeBSD.org</email></title>
+      <title>&a.security-officer;</title>
       &pgpkey.security-officer;
     </sect2>
 
     <sect2>
-      <title>FreeBSD core secretary
-	<email>core-secretary@FreeBSD.org</email></title>
+      <title>&a.core-secretary;</title>
       &pgpkey.core-secretary;
     </sect2>
 
@@ -38,26 +36,25 @@
   <sect1 id="pgpkeys-core">
     <title>�������������</title>
 
-    <sect2>
-      <title>&a.jkh;</title>
-      &pgpkey.jkh;      
-    </sect2>
-    
     <sect2>
       <title>&a.imp;</title>
       &pgpkey.imp;      
     </sect2>
-    
+
+    <sect2>
+      <title>&a.kuriyama;</title>
+      &pgpkey.kuriyama;
+    </sect2>
+
+    <sect2>
+      <title>&a.murray;</title>
+      &pgpkey.murray;
+    </sect2>
+
     <sect2>
       <title>&a.peter;</title>
       &pgpkey.peter;      
     </sect2>
-    
-    <sect2>
-      <title>&a.dfr;</title>
-      &pgpkey.dfr;      
-    </sect2>
-    
   </sect1>
   
   <sect1 id="pgpkeys-developers">
@@ -93,6 +90,16 @@
       &pgpkey.wilko;
     </sect2>
 
+    <sect2>
+      <title>&a.jon;</title>
+      &pgpkey.jon;
+    </sect2>
+
+    <sect2>
+      <title>&a.luoqi;</title>
+      &pgpkey.luoqi;
+    </sect2>
+
     <sect2>
       <title>&a.ache;</title>
       &pgpkey.ache;
@@ -108,6 +115,11 @@
       &pgpkey.nik;
     </sect2>
 
+    <sect2>
+      <title>&a.ceri;</title>
+      &pgpkey.ceri;
+    </sect2>
+
     <sect2>
       <title>&a.brooks;</title>
       &pgpkey.brooks;
@@ -128,6 +140,11 @@
       &pgpkey.ue;
     </sect2>
 
+    <sect2>
+      <title>&a.ru;</title>
+      &pgpkey.ru;
+    </sect2>
+
     <sect2>
       <title>&a.jedgar;</title>
       &pgpkey.jedgar;
@@ -143,11 +160,21 @@
       &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;
@@ -168,6 +195,11 @@
       &pgpkey.jhay;
     </sect2>
 
+    <sect2>
+      <title>&a.sheldonh;</title>
+      &pgpkey.sheldonh;
+    </sect2>
+
     <sect2>
       <title>&a.mikeh;</title>
       &pgpkey.mikeh;
@@ -178,6 +210,16 @@
       &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;
@@ -219,13 +261,13 @@
     </sect2>
 
     <sect2>
-      <title>&a.kuriyama;</title>
-      &pgpkey.kuriyama;
+      <title>&a.alex;</title>
+      &pgpkey.alex;
     </sect2>
 
     <sect2>
-      <title>&a.alex;</title>
-      &pgpkey.alex;
+      <title>&a.netchild;</title>
+      &pgpkey.netchild;
     </sect2>
 
     <sect2>
@@ -333,6 +375,11 @@
       &pgpkey.markp;
     </sect2>
 
+    <sect2>
+      <title>&a.dfr;</title>
+      &pgpkey.dfr;
+    </sect2>
+
     <sect2>
       <title>&a.benno;</title>
       &pgpkey.benno;
@@ -383,6 +430,11 @@
       &pgpkey.jesper;
     </sect2>
 
+    <sect2>
+      <title>&a.scop;</title>
+      &pgpkey.scop;
+    </sect2>
+
     <sect2>
       <title>&a.ben;</title>
       &pgpkey.ben;
@@ -408,11 +460,6 @@
       &pgpkey.brian;
     </sect2>
 
-    <sect2>
-      <title>&a.murray;</title>
-      &pgpkey.murray;
-    </sect2>
-
     <sect2>
       <title>&a.gsutter;</title>
       &pgpkey.gsutter;
@@ -428,6 +475,11 @@
       &pgpkey.mi;
     </sect2>
 
+    <sect2>
+      <title>&a.gordon;</title>
+      &pgpkey.gordon;
+    </sect2>
+
     <sect2>
       <title>&a.nectar;</title>
       &pgpkey.nectar;