diff --git a/en_US.ISO8859-1/articles/contributing/article.sgml b/en_US.ISO8859-1/articles/contributing/article.sgml
index 27d90fb02b..f46084ed6a 100644
--- a/en_US.ISO8859-1/articles/contributing/article.sgml
+++ b/en_US.ISO8859-1/articles/contributing/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/contrib/chapter.sgml,v 1.232 2000/06/20 19:14:03 alex Exp $
+     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/contrib/chapter.sgml,v 1.233 2000/06/22 11:21:46 nbm Exp $
 -->
 
 <chapter id="contrib">
@@ -4858,10 +4858,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         <para>Shuichi Tanaka <email>stanaka@bb.mbn.or.jp</email></para>
       </listitem>
 
-      <listitem>
-        <para>Shunsuke Akiyama <email>akiyama@jp.FreeBSD.org</email></para>
-      </listitem>
-
       <listitem>
         <para>Simon <email>simon@masi.ibp.fr</email></para>
       </listitem>
diff --git a/en_US.ISO8859-1/books/handbook/authors.ent b/en_US.ISO8859-1/books/handbook/authors.ent
index 6a16eb3d8c..87fe977d84 100644
--- a/en_US.ISO8859-1/books/handbook/authors.ent
+++ b/en_US.ISO8859-1/books/handbook/authors.ent
@@ -7,7 +7,7 @@
 
      Please keep this list in alphabetical order by entity names.
 
-     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/authors.ent,v 1.92 2000/06/20 12:36:30 sanpei Exp $
+     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/authors.ent,v 1.93 2000/06/20 22:53:44 cokane Exp $
 -->
 
 <!ENTITY a.abial "Andrzej Bialecki <email>abial@FreeBSD.org</email>">
@@ -18,6 +18,8 @@
 
 <!ENTITY a.ade "Ade Lovett <email>ade@FreeBSD.org</email>">
 
+<!ENTITY a.akiyama "Shunsuke Akiyama <email>akiyama@FreeBSD.org</email>">
+
 <!ENTITY a.alc "Alan L. Cox <email>alc@FreeBSD.org</email>">
 
 <!ENTITY a.alex "Alexander Langer <email>alex@FreeBSD.org</email>">
diff --git a/en_US.ISO8859-1/books/handbook/contrib/chapter.sgml b/en_US.ISO8859-1/books/handbook/contrib/chapter.sgml
index 27d90fb02b..f46084ed6a 100644
--- a/en_US.ISO8859-1/books/handbook/contrib/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/contrib/chapter.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/contrib/chapter.sgml,v 1.232 2000/06/20 19:14:03 alex Exp $
+     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/contrib/chapter.sgml,v 1.233 2000/06/22 11:21:46 nbm Exp $
 -->
 
 <chapter id="contrib">
@@ -4858,10 +4858,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         <para>Shuichi Tanaka <email>stanaka@bb.mbn.or.jp</email></para>
       </listitem>
 
-      <listitem>
-        <para>Shunsuke Akiyama <email>akiyama@jp.FreeBSD.org</email></para>
-      </listitem>
-
       <listitem>
         <para>Simon <email>simon@masi.ibp.fr</email></para>
       </listitem>
diff --git a/en_US.ISO8859-1/books/handbook/staff/chapter.sgml b/en_US.ISO8859-1/books/handbook/staff/chapter.sgml
index b0e59eafaf..53d11813a5 100644
--- a/en_US.ISO8859-1/books/handbook/staff/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/staff/chapter.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/staff/chapter.sgml,v 1.129 2000/06/20 18:57:18 cokane Exp $
+     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/staff/chapter.sgml,v 1.130 2000/06/20 19:20:30 alex Exp $
 -->
 
 <!-- 
@@ -96,6 +96,10 @@
       also developers.</para>
     
     <itemizedlist>
+      <listitem>
+	<para>&a.akiyama;</para>
+      </listitem>
+
       <listitem>
 	<para>&a.jmas;</para>
       </listitem>
diff --git a/en_US.ISO8859-1/share/sgml/authors.ent b/en_US.ISO8859-1/share/sgml/authors.ent
index 6a16eb3d8c..87fe977d84 100644
--- a/en_US.ISO8859-1/share/sgml/authors.ent
+++ b/en_US.ISO8859-1/share/sgml/authors.ent
@@ -7,7 +7,7 @@
 
      Please keep this list in alphabetical order by entity names.
 
-     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/authors.ent,v 1.92 2000/06/20 12:36:30 sanpei Exp $
+     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/authors.ent,v 1.93 2000/06/20 22:53:44 cokane Exp $
 -->
 
 <!ENTITY a.abial "Andrzej Bialecki <email>abial@FreeBSD.org</email>">
@@ -18,6 +18,8 @@
 
 <!ENTITY a.ade "Ade Lovett <email>ade@FreeBSD.org</email>">
 
+<!ENTITY a.akiyama "Shunsuke Akiyama <email>akiyama@FreeBSD.org</email>">
+
 <!ENTITY a.alc "Alan L. Cox <email>alc@FreeBSD.org</email>">
 
 <!ENTITY a.alex "Alexander Langer <email>alex@FreeBSD.org</email>">
diff --git a/en_US.ISO_8859-1/books/handbook/authors.ent b/en_US.ISO_8859-1/books/handbook/authors.ent
index 6a16eb3d8c..87fe977d84 100644
--- a/en_US.ISO_8859-1/books/handbook/authors.ent
+++ b/en_US.ISO_8859-1/books/handbook/authors.ent
@@ -7,7 +7,7 @@
 
      Please keep this list in alphabetical order by entity names.
 
-     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/authors.ent,v 1.92 2000/06/20 12:36:30 sanpei Exp $
+     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/authors.ent,v 1.93 2000/06/20 22:53:44 cokane Exp $
 -->
 
 <!ENTITY a.abial "Andrzej Bialecki <email>abial@FreeBSD.org</email>">
@@ -18,6 +18,8 @@
 
 <!ENTITY a.ade "Ade Lovett <email>ade@FreeBSD.org</email>">
 
+<!ENTITY a.akiyama "Shunsuke Akiyama <email>akiyama@FreeBSD.org</email>">
+
 <!ENTITY a.alc "Alan L. Cox <email>alc@FreeBSD.org</email>">
 
 <!ENTITY a.alex "Alexander Langer <email>alex@FreeBSD.org</email>">
diff --git a/en_US.ISO_8859-1/books/handbook/contrib/chapter.sgml b/en_US.ISO_8859-1/books/handbook/contrib/chapter.sgml
index 27d90fb02b..f46084ed6a 100644
--- a/en_US.ISO_8859-1/books/handbook/contrib/chapter.sgml
+++ b/en_US.ISO_8859-1/books/handbook/contrib/chapter.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/contrib/chapter.sgml,v 1.232 2000/06/20 19:14:03 alex Exp $
+     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/contrib/chapter.sgml,v 1.233 2000/06/22 11:21:46 nbm Exp $
 -->
 
 <chapter id="contrib">
@@ -4858,10 +4858,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         <para>Shuichi Tanaka <email>stanaka@bb.mbn.or.jp</email></para>
       </listitem>
 
-      <listitem>
-        <para>Shunsuke Akiyama <email>akiyama@jp.FreeBSD.org</email></para>
-      </listitem>
-
       <listitem>
         <para>Simon <email>simon@masi.ibp.fr</email></para>
       </listitem>
diff --git a/en_US.ISO_8859-1/books/handbook/staff/chapter.sgml b/en_US.ISO_8859-1/books/handbook/staff/chapter.sgml
index b0e59eafaf..53d11813a5 100644
--- a/en_US.ISO_8859-1/books/handbook/staff/chapter.sgml
+++ b/en_US.ISO_8859-1/books/handbook/staff/chapter.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/staff/chapter.sgml,v 1.129 2000/06/20 18:57:18 cokane Exp $
+     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/staff/chapter.sgml,v 1.130 2000/06/20 19:20:30 alex Exp $
 -->
 
 <!-- 
@@ -96,6 +96,10 @@
       also developers.</para>
     
     <itemizedlist>
+      <listitem>
+	<para>&a.akiyama;</para>
+      </listitem>
+
       <listitem>
 	<para>&a.jmas;</para>
       </listitem>