diff --git a/ja_JP.eucJP/books/handbook/book.sgml b/ja_JP.eucJP/books/handbook/book.sgml
index 8a540f8b03..69c98aafa0 100644
--- a/ja_JP.eucJP/books/handbook/book.sgml
+++ b/ja_JP.eucJP/books/handbook/book.sgml
@@ -3,7 +3,7 @@
      The FreeBSD Japanese Documentation Project
 
      Original revision: 1.79
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/book.sgml,v 1.46 1999/09/06 06:53:21 peter Exp $
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/book.sgml,v 1.47 1999/09/08 13:23:51 kuriyama Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN" [
@@ -17,6 +17,7 @@
 <!ENTITY % authors  SYSTEM "authors.ent">  %authors;
 <!ENTITY % jauthors SYSTEM "jauthors.ent"> %jauthors;
 <!ENTITY % mailing-lists SYSTEM "mailing-lists.ent"> %mailing-lists;
+<!ENTITY % newsgroups SYSTEM "newsgroups.ent"> %newsgroups;
 
 <!-- This value is used to create some links on web sites and such,
      so do NOT change this until it's really release time! -->
@@ -61,16 +62,12 @@
 	&a.doc; �ޤ� (�Ѹ��) �Żҥ᡼��� ���äƤ�������.
 	�ϥ�ɥ֥å����Τ�Τ˴ؤ��������, �������
 	�����ʤ��Ƥ��ޤ�. (�������Ѹ�ǤǤ�.) ���ܸ��������,
-	���ܸ��ǤΤߤ˴ؤ��뤳�Ȥ� FreeBSD
-	���ܸ�ɥ�����ơ������ץ��������� <emphasis
-	  remap=tt><email>doc-jp@jp.FreeBSD.org</email></emphasis>
+	���ܸ��ǤΤߤ˴ؤ��뤳�Ȥ� FreeBSD &a.jp.doc-jp;
 	�ˤ��������ܸ�� ��������Ƥ��ޤ�.
 	ɬ�פ˱��������ܸ�ɥ�����ơ������ץ��������Ȥ���
 	�ܲȥɥ�����ơ������ץ��������Ȥ��Ф���
 	�ե����ɥХå��򤪤��ʤ��ޤ��Τ�, �Ѹ줬���դǤʤ����� FreeBSD
-	���ܸ�ɥ�����ơ������ץ��������� <!-- kuriyama - should
-	replace &a.ja.doc; --> <emphasis
-	  remap=tt><email>doc-jp@jp.FreeBSD.org</email></emphasis>
+	&a.jp.doc-jp;
 	�ޤ����ܸ�ǥ����Ȥ򤪴󤻤�������.
 	���Υɥ�����Ȥκǿ��С�������, ���ĤǤ� <ulink
 	  URL="http://www.jp.FreeBSD.org/">���ܹ����� FreeBSD World
diff --git a/ja_JP.eucJP/books/handbook/jauthors.ent b/ja_JP.eucJP/books/handbook/jauthors.ent
index d46c6a523f..578661dac2 100644
--- a/ja_JP.eucJP/books/handbook/jauthors.ent
+++ b/ja_JP.eucJP/books/handbook/jauthors.ent
@@ -3,12 +3,12 @@
      The FreeBSD Japanese Documentation Project
 
      Original revision: 
-     $FreeBSD$
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/jauthors.ent,v 1.3 1999/09/06 06:53:21 peter Exp $
 
      Names and email address of Japanese local contributing authors and 
-     jaz.jp.freebsd.org CVS committers.
-     Entity names for committers on jaz should be the same as their login
-     names on jaz.jp.FreeBSD.ORG.
+     castle.jp.freebsd.org CVS committers.
+     Entity names for committers on castle should be the same as their login
+     names on castle.jp.FreeBSD.ORG.
 
      Use these entities when referencing people.
 
@@ -80,3 +80,10 @@ authors.sgml 
 
 <!ENTITY a.jp.yuki "���� ���� <email>yuki@jp.FreeBSD.org</email>">
 
+<!--
+     Names of FreeBSD mailing list in Japan.  If we refer many mailing
+     lists in Japan, create jmailing-lists.ent file and store them in
+     it.
+-->
+
+<!ENTITY a.jp.doc-jp "���ܸ�ɥ�����ơ������ץ��������� <email>doc-jp@jp.FreeBSD.org</email>">
diff --git a/ja_JP.eucJP/share/sgml/jauthors.ent b/ja_JP.eucJP/share/sgml/jauthors.ent
index d46c6a523f..578661dac2 100644
--- a/ja_JP.eucJP/share/sgml/jauthors.ent
+++ b/ja_JP.eucJP/share/sgml/jauthors.ent
@@ -3,12 +3,12 @@
      The FreeBSD Japanese Documentation Project
 
      Original revision: 
-     $FreeBSD$
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/jauthors.ent,v 1.3 1999/09/06 06:53:21 peter Exp $
 
      Names and email address of Japanese local contributing authors and 
-     jaz.jp.freebsd.org CVS committers.
-     Entity names for committers on jaz should be the same as their login
-     names on jaz.jp.FreeBSD.ORG.
+     castle.jp.freebsd.org CVS committers.
+     Entity names for committers on castle should be the same as their login
+     names on castle.jp.FreeBSD.ORG.
 
      Use these entities when referencing people.
 
@@ -80,3 +80,10 @@ authors.sgml 
 
 <!ENTITY a.jp.yuki "���� ���� <email>yuki@jp.FreeBSD.org</email>">
 
+<!--
+     Names of FreeBSD mailing list in Japan.  If we refer many mailing
+     lists in Japan, create jmailing-lists.ent file and store them in
+     it.
+-->
+
+<!ENTITY a.jp.doc-jp "���ܸ�ɥ�����ơ������ץ��������� <email>doc-jp@jp.FreeBSD.org</email>">