diff --git a/share/doc/handbook/authors.sgml b/share/doc/handbook/authors.sgml
index f3a2697d0834..5ffa2ed3fb51 100644
--- a/share/doc/handbook/authors.sgml
+++ b/share/doc/handbook/authors.sgml
@@ -7,6 +7,10 @@ Use these entities when referencing people.  Please note the use of single
 and double quotes.  
 -->
 
+<!ENTITY a.asami "Satoshi Asami 
+  <tt><htmlurl url='mailto:asami@FreeBSD.ORG'
+  name='&lt;asami@FreeBSD.ORG&gt;'></tt>">
+
 <!ENTITY a.ache "Andrey A. Chernov
   <tt><htmlurl url='mailto:ache@FreeBSD.ORG'
   name='&lt;ache@FreeBSD.ORG&gt;'></tt>">
@@ -15,26 +19,26 @@ and double quotes.
   <tt><htmlurl url='mailto:adam@FreeBSD.ORG'
   name='&lt;adam@FreeBSD.ORG&gt;'></tt>">
 
-<!ENTITY a.alex "Alex Nash
-  <tt><htmlurl url='mailto:alex@freebsd.org'
-  name='&lt;alex@freebsd.org&gt;'></tt>">
+<!ENTITY a.andreas "Andreas Klemm 
+  <tt><htmlurl url='mailto:andreas@FreeBSD.ORG' 
+  name='&lt;andreas@FreeBSD.ORG&gt;'></tt>">
 
 <!ENTITY a.amurai  "Atsushi Murai
   <tt><htmlurl url='mailto:amurai@FreeBSD.ORG'
   name='&lt;amurai@FreeBSD.ORG&gt;'></tt>">
 
-<!ENTITY a.andreas "Andreas Klemm 
-  <tt><htmlurl url='mailto:andreas@FreeBSD.ORG' 
-  name='&lt;andreas@FreeBSD.ORG&gt;'></tt>">
-
-<!ENTITY a.asami "Satoshi Asami 
-  <tt><htmlurl url='mailto:asami@FreeBSD.ORG'
-  name='&lt;asami@FreeBSD.ORG&gt;'></tt>">
+<!ENTITY a.alex "Alex Nash
+  <tt><htmlurl url='mailto:alex@freebsd.org'
+  name='&lt;alex@freebsd.org&gt;'></tt>">
 
 <!ENTITY a.ats  "Andreas Schulz
   <tt><htmlurl url='mailto:ats@FreeBSD.ORG'
   name='&lt;ats@FreeBSD.ORG&gt;'></tt>">
 
+<!ENTITY a.yokota  "Kazutaka YOKOTA
+  <tt><htmlurl url='mailto:yokota@FreeBSD.ORG'
+  name='&lt;yokota@FreeBSD.ORG&gt;'></tt>">
+
 <!ENTITY a.awebster "Andrew Webster 
   <tt><htmlurl url='mailto:awebster@pubnix.net' 
   name='&lt;awebster@pubnix.net&gt;'></tt>">
diff --git a/share/doc/handbook/contrib.sgml b/share/doc/handbook/contrib.sgml
index f7da62ec0384..07124a8f8f19 100644
--- a/share/doc/handbook/contrib.sgml
+++ b/share/doc/handbook/contrib.sgml
@@ -105,6 +105,7 @@ groups of people:
         <item>&a.guido;
         <item>&a.swallace;
         <item>&a.nate;
+	<item>&a.yokota;
         <item>&a.jmz; 
       </itemize>