diff --git a/ja_JP.eucJP/articles/Makefile b/ja_JP.eucJP/articles/Makefile
index 8b77e845e0..ad8afd3886 100644
--- a/ja_JP.eucJP/articles/Makefile
+++ b/ja_JP.eucJP/articles/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
-# Original revision: 1.36
+# Original revision: 1.42
 
 SUBDIR =
 #SUBDIR+= 5-roadmap
@@ -22,16 +22,18 @@ SUBDIR+= fonts
 #SUBDIR+= hats
 #SUBDIR+= hubs
 SUBDIR+= ipsec-must
-#SUBDIR+= laptop
 #SUBDIR+= java-tomcat
+#SUBDIR+= laptop
+#SUBDIR+= mailing-list-faq
 #SUBDIR+= mh
 SUBDIR+= multi-os
 #SUBDIR+= new-users
 #SUBDIR+= pam
+#SUBDIR+= portbuild
 #SUBDIR+= pr-guidelines
 SUBDIR+= problem-reports
-#SUBDIR+= programming-tools
 #SUBDIR+= pxe
+#SUBDIR+= relaydelay
 #SUBDIR+= releng
 #SUBDIR+= releng-packages
 #SUBDIR+= serial-uart
diff --git a/ja_JP.eucJP/articles/contributing/Makefile b/ja_JP.eucJP/articles/contributing/Makefile
index 5aceb30fb2..1591509dde 100644
--- a/ja_JP.eucJP/articles/contributing/Makefile
+++ b/ja_JP.eucJP/articles/contributing/Makefile
@@ -1,17 +1,21 @@
+#
 # $FreeBSD$
-# Original revision: 1.4
+#
+# Article: Contributing to FreeBSD
+#
+# Original revision: 1.6
 
 DOC?= article
+WITH_ARTICLE_TOC?= YES
 
 FORMATS?= html
 
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-WITH_ARTICLE_TOC?=YES
+SRCS=	article.sgml
 
-SRCS= article.sgml
-
-DOC_PREFIX?= ${.CURDIR}/../../..
+URL_RELPREFIX?=	../../../..
+DOC_PREFIX?=	${.CURDIR}/../../..
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ja_JP.eucJP/articles/contributors/Makefile b/ja_JP.eucJP/articles/contributors/Makefile
index cc70244bad..bd0f2046dd 100644
--- a/ja_JP.eucJP/articles/contributors/Makefile
+++ b/ja_JP.eucJP/articles/contributors/Makefile
@@ -1,26 +1,31 @@
+#
 # $FreeBSD$
-# Original revision: 1.6
+#
+# Article: Contributors to FreeBSD
+#
+# Original revision: 1.9
 
 DOC?= article
 
 FORMATS?= html
+WITH_ARTICLE_TOC?= YES
 
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-WITH_ARTICLE_TOC?=YES
+ORGDIR=	${DOC_PREFIX}/en_US.ISO8859-1/articles/contributors
 
-ORGDIR=${DOC_PREFIX}/en_US.ISO8859-1/articles/contributors
+SRCS=	article.sgml
+SRCS+=	${ORGDIR}/contrib.ent
+SRCS+=	${ORGDIR}/contrib.386bsd.sgml
+SRCS+=	${ORGDIR}/contrib.additional.sgml
+SRCS+=	${ORGDIR}/contrib.committers.sgml
+SRCS+=	${ORGDIR}/contrib.core.sgml
+SRCS+=	${ORGDIR}/contrib.corealumni.sgml
+SRCS+=	${ORGDIR}/contrib.develalumni.sgml
+SRCS+=	${ORGDIR}/contrib.staff.sgml
 
-SRCS= article.sgml
-SRCS+=${ORGDIR}/contrib.ent
-SRCS+=${ORGDIR}/contrib.386bsd.sgml
-SRCS+=${ORGDIR}/contrib.additional.sgml
-SRCS+=${ORGDIR}/contrib.committers.sgml
-SRCS+=${ORGDIR}/contrib.core.sgml
-SRCS+=${ORGDIR}/contrib.corealumni.sgml
-SRCS+=${ORGDIR}/contrib.develalumni.sgml
-
-DOC_PREFIX?= ${.CURDIR}/../../..
+URL_RELPREFIX?=	../../../..
+DOC_PREFIX?=	${.CURDIR}/../../..
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ja_JP.eucJP/articles/contributors/article.sgml b/ja_JP.eucJP/articles/contributors/article.sgml
index 025dba2762..675ea81e86 100644
--- a/ja_JP.eucJP/articles/contributors/article.sgml
+++ b/ja_JP.eucJP/articles/contributors/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.420
+     Original revision: 1.434
      $FreeBSD$
 -->
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -21,6 +21,7 @@
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
+      &tm-attrib.cvsup;
       &tm-attrib.sun;
       &tm-attrib.general;
     </legalnotice>
@@ -319,7 +320,7 @@
 	    <para><ulink url="http://www.osd.bsdi.com/">BSDi
 		</ulink> (���ĤƤ� Walnut Creek CDROM) �ϡ�
 	      ����ɽ���ʤ��ۤ�¿���δ��դ򤷤Ƥ��������ޤ��� (�ܺ٤�
-	      <ulink url="../../ja/books/handbook">FreeBSD �ϥ�ɥ֥å�</ulink>��
+	      <ulink url="&url.books.handbook;/index.html">FreeBSD �ϥ�ɥ֥å�</ulink>��
 	      ��FreeBSD �ץ��������ȤˤĤ��ơפξϤ�����������)��
 	      �äˡ��䤿���Τ�Ȥ�ȤΥץ饤�ޥ곫ȯ�ޥ���Ǥ���
 	      <hostid role="fqdn">freefall.FreeBSD.org</hostid>��
@@ -376,6 +377,17 @@
     &contrib.core;
   </sect1>
 
+<!-- The following is the staff listing. -->
+
+  <sect1 id="staff-listing">
+    <title>����¾�� &os; ������</title>
+
+    <para>&os; �ץ��������Ȥ�ɬ�פ˱���������ο�ã�˸��¤��Ǥ���Ƥ��ޤ���
+      ���ߡ��������Ƥ��뤵�ޤ��ޤʥ�����λ���ʬ��Ȥ��Υ��Ф�ʲ��˾Ҳ𤷤ޤ���</para>
+
+    &contrib.staff;
+  </sect1>
+
 <!--
 	This list is sorted by last name, not by entity or tenure.
 -->
@@ -395,7 +407,7 @@
   <sect1 id="staff-doc">
     <title>FreeBSD �ɥ�����ơ������ץ���������</title>
 
-    <para><ulink url="../../../../ja/docproj/index.html">FreeBSD
+    <para><ulink url="&url.base;/docproj/index.html">FreeBSD
 	�ɥ�����ơ������ץ���������</ulink>��ʣ���Υ����ӥ�����
       ���Ƥ��ޤ������줾��Υ����ӥ��ϡ��ʲ���ô���ԤȤ���
       <emphasis>��ô����</emphasis>�ˤ�äƱ��Ѥ���Ƥ��ޤ���</para>
@@ -405,7 +417,7 @@
 	<term>�ɥ�����ơ������ץ���������ô��</term>
 
 	<listitem>
-	  <para>&a.nik;</para>
+	  <para>&a.doceng;</para>
 	</listitem>
       </varlistentry>
 
@@ -429,7 +441,7 @@
 	<term>�˥塼���ե�å����Խ�ô��</term>
 
 	<listitem>
-	  <para>&a.jim;</para>
+	  <para>&a.www;</para>
 	</listitem>
       </varlistentry>
 
@@ -462,7 +474,7 @@
 	<term>���ѥ٥�����ڡ���ô��</term>
 
 	<listitem>
-	  <para>&a.ceri;</para>
+	  <para>&a.josef;</para>
 	</listitem>
       </varlistentry>
 
@@ -481,14 +493,6 @@
 	  <para>&a.patrick;</para>
 	</listitem>
       </varlistentry>
-
-      <varlistentry>
-        <term>LinuxDoc ���� DocBook �ؤΰܹ�</term>
-
-	<listitem>
-	  <para>&a.nik;</para>
-	</listitem>
-      </varlistentry>
     </variablelist>
   </sect1>
 
@@ -497,11 +501,11 @@
 
     <variablelist>
       <varlistentry>
-	<term><ulink url="../../../../ja/docproj/index.html">
+	<term><ulink url="&url.base;/docproj/index.html">
 	    �ɥ�����ơ������ץ���������ô��</ulink></term>
 
 	<listitem>
-	  <para>&a.nik;</para>
+	  <para>&a.doceng;</para>
 	</listitem>
       </varlistentry>
 
@@ -519,6 +523,19 @@
  	</listitem>
       </varlistentry>
 
+       <varlistentry>
+	<term>FTP/WWW �ߥ顼�����ȥ����ǥ��͡���</term>
+
+	<listitem>
+	  <para>&a.mirror-admin;</para>
+
+	  <para>ô��:</para>
+
+	  <para>&a.kuriyama;,</para>
+	  <para>&a.kensmith;</para>
+	</listitem>
+      </varlistentry>
+
       <varlistentry>
 	<term>�ϰ貽</term>
 
@@ -531,12 +548,17 @@
 	<term>�ݥ��ȥޥ���</term>
 
 	<listitem>
-	  <para>&a.jmb;</para>
+	  <para><hostid role="domainname">FreeBSD.org</hostid>
+	    �ݥ��ȥޥ��������� <email>postmaster@FreeBSD.org</email></para>
+
+	  <para>ô��:</para>
+
+	  <para>David Wolfskill</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
-	<term><ulink url="../../releng/index.html">��꡼�������ǥ��͡������</ulink></term>
+	<term><ulink url="&url.articles.releng.en;/index.html">��꡼�������ǥ��͡������</ulink></term>
 
 	<listitem>	
 	  <para>&a.re; (�꡼���� &a.murray;)</para>
@@ -552,7 +574,7 @@
       </varlistentry>
 
       <varlistentry>
-	<term><ulink url="../../../../ja/security/index.html">
+	<term><ulink url="&url.base;/security/index.html">
 	    �������ƥ����ե���</ulink></term>
 
 	<listitem>
@@ -561,7 +583,7 @@
       </varlistentry>
 
       <varlistentry>
-	<term><ulink url="../../../../ja/support.html#cvs">
+	<term><ulink url="&url.base;/support.html#cvs">
 	    CVS �ĥ꡼������</ulink></term>
 
 	<listitem>
@@ -581,22 +603,21 @@
       </varlistentry>
 
       <varlistentry>
-	<term><ulink url="../../../../ja/ports/">
-	    Ports Collection ô��</ulink></term>
+	<term><ulink url="&url.base;/ports/index.html">
+	    Ports �ޥ͡�����</ulink></term>
 
 	<listitem>
 	  <para>&a.portmgr;</para>
 
 	  <para>�ʲ��Υ��Фǹ�������Ƥ��ޤ���</para>
 
-	  <para>&a.asami;,</para>
-	  <para>&a.knu;,</para>
 	  <para>&a.kris;,</para>
-	  <para>&a.lioux;,</para>
 	  <para>&a.marcus;,</para>
-	  <para>&a.sobomax;,</para>
-	  <para>&a.steve;,</para>
-	  <para>&a.will;</para>
+	  <para>&a.will;,</para>
+	  <para>&a.linimon;,</para>
+	  <para>&a.eik;,</para>
+	  <para>&a.krion;,</para>
+	  <para>&a.erwin; (���)</para>
 	</listitem>
       </varlistentry>
 
@@ -617,24 +638,28 @@
       </varlistentry>
 
       <varlistentry>
-	<term><ulink url="../../../../ja/support.html#gnats">
+	<term><ulink url="&url.base;/support.html#gnats">
 	    GNATS ������</ulink></term>
 
 	<listitem>
-	  <para>&a.steve;</para>
+	  <para>&a.ceri;</para>
+	  <para>&a.keramida;</para>
+	  <para>&a.linimon;</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
-	<term>Bugmeister</term>
+	<term>Bugmeisters</term>
 
 	<listitem>
 	  <para>&a.ceri;</para>
+	  <para>&a.keramida;</para>
+	  <para>&a.linimon;</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
-	<term><ulink url="../../../../donations/index.html">��£�ʼ��ջ�̳��</ulink></term>
+	<term><ulink url="&url.base;/donations/index.html">��£�ʼ��ջ�̳��</ulink></term>
 
 	<listitem>
 	  <para>&a.donations;</para>
diff --git a/ja_JP.eucJP/articles/dialup-firewall/Makefile b/ja_JP.eucJP/articles/dialup-firewall/Makefile
index e85e0f02f7..23047691fe 100644
--- a/ja_JP.eucJP/articles/dialup-firewall/Makefile
+++ b/ja_JP.eucJP/articles/dialup-firewall/Makefile
@@ -1,5 +1,9 @@
+#
 # $FreeBSD$
-# Original revision: 1.3
+#
+# Article: Dialup firewalling with FreeBSD
+#
+# Original revision: 1.5
 
 DOC?= article
 
@@ -8,8 +12,9 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS= article.sgml
+SRCS=	article.sgml
 
-DOC_PREFIX?= ${.CURDIR}/../../..
+URL_RELPREFIX?=	../../../..
+DOC_PREFIX?=	${.CURDIR}/../../..
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ja_JP.eucJP/articles/dialup-firewall/article.sgml b/ja_JP.eucJP/articles/dialup-firewall/article.sgml
index 36927a6597..3dc8881f0d 100644
--- a/ja_JP.eucJP/articles/dialup-firewall/article.sgml
+++ b/ja_JP.eucJP/articles/dialup-firewall/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.39
+     Original revision: 1.40
      $FreeBSD$
 -->
 
diff --git a/ja_JP.eucJP/articles/diskless-x/Makefile b/ja_JP.eucJP/articles/diskless-x/Makefile
index caded4d6a5..4a33b0d45d 100644
--- a/ja_JP.eucJP/articles/diskless-x/Makefile
+++ b/ja_JP.eucJP/articles/diskless-x/Makefile
@@ -1,5 +1,9 @@
+#
 # $FreeBSD$
-# Original revision: 1.7
+#
+# Article: Diskless X Server: a how to guide
+#
+# Original revision: 1.8
 
 DOC?= article
 
@@ -8,7 +12,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS= article.sgml
+SRCS=	article.sgml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
diff --git a/ja_JP.eucJP/articles/diskless-x/article.sgml b/ja_JP.eucJP/articles/diskless-x/article.sgml
index 3195662601..6f48fa36e6 100644
--- a/ja_JP.eucJP/articles/diskless-x/article.sgml
+++ b/ja_JP.eucJP/articles/diskless-x/article.sgml
@@ -2,7 +2,7 @@
     The FreeBSD Documentation Project
     The FreeBSD Japanese Documentation Project
 
-    Original revision: 1.15
+    Original revision: 1.16
     $FreeBSD$
 -->
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
diff --git a/ja_JP.eucJP/articles/fbsd-from-scratch/Makefile b/ja_JP.eucJP/articles/fbsd-from-scratch/Makefile
index b6b62fdd9a..58cdcde341 100644
--- a/ja_JP.eucJP/articles/fbsd-from-scratch/Makefile
+++ b/ja_JP.eucJP/articles/fbsd-from-scratch/Makefile
@@ -3,7 +3,7 @@
 #
 # Article: FreeBSD From Scratch
 #
-# Original revision: 1.4
+# Original revision: 1.6
 
 DOC?= article
 
@@ -14,13 +14,19 @@ MAINTAINER= schweikh@FreeBSD.org
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-# SGML content
-SRCS= article.sgml stage_1.sh stage_2.sh stage_3.mk
+#EXTRAS=	stage_1.conf.default
+EXTRAS+=	stage_1.sh
+#EXTRAS+=	stage_2.conf.default
+EXTRAS+=	stage_2.sh
+EXTRAS+=	stage_3.mk
 
-DOC_PREFIX?= ${.CURDIR}/../../..
+SRCS=		article.sgml
+SRCS+=		${EXTRAS}
 
 afterinstall:
-	${INSTALL_DOCS} ${.CURDIR}/stage_1.sh ${.CURDIR}/stage_2.sh \
-	    ${.CURDIR}/stage_3.mk ${DESTDIR}
+.for entry in ${EXTRAS}
+	${INSTALL_DOCS} ${.CURDIR}/${entry} ${DESTDIR}
+.endfor
 
+DOC_PREFIX?= ${.CURDIR}/../../..
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ja_JP.eucJP/articles/fonts/Makefile b/ja_JP.eucJP/articles/fonts/Makefile
index 621b034154..94282fa325 100644
--- a/ja_JP.eucJP/articles/fonts/Makefile
+++ b/ja_JP.eucJP/articles/fonts/Makefile
@@ -1,5 +1,9 @@
+#
 # $FreeBSD$
-# Original revision: 1.10
+#
+# Article: Fonts and FreeBSD
+#
+# Original revision: 1.12
 
 DOC?= article
 
@@ -8,8 +12,9 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS= article.sgml
+SRCS=	article.sgml
 
+URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ja_JP.eucJP/articles/fonts/article.sgml b/ja_JP.eucJP/articles/fonts/article.sgml
index 8ae3f35fd4..41ba845bbc 100644
--- a/ja_JP.eucJP/articles/fonts/article.sgml
+++ b/ja_JP.eucJP/articles/fonts/article.sgml
@@ -3,7 +3,7 @@
     The FreeBSD Japanese Documentation Project
 
     $FreeBSD$
-    Original revision: 1.24
+    Original revision: 1.27
 -->
 <!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
@@ -497,7 +497,7 @@ showboat.pfb -type1-showboat-medium-r-normal-decorative-0-0-0-0-p-0-iso8859-1
 
     <para>����ʸ��: &man.xfontsel.1;��&man.xset.1;��<citetitle>The X
 	Windows System in a Nutshell</citetitle>��<ulink
-	URL="http://www.ora.com/">O'Reilly &amp;
+	url="http://www.ora.com/">O'Reilly &amp;
 	Associates</ulink></para>
   </sect1>
 
@@ -884,7 +884,7 @@ Converting 3of9.ttf to A.pfa and B.afm.
       <listitem>
         <para>XFree86 4.x �˴ޤޤ�Ƥ��� freetype �⥸�塼�롣
 	�ܺ٤� <ulink
-        url="../../books/handbook/x-fonts.html">FreeBSD
+        url="&url.books.handbook;/x-fonts.html">FreeBSD
         �ϥ�ɥ֥å�</ulink>�� <ulink
         url="http://www.xfree86.org/4.0.2/fonts.html">XFree86 4.0.2
         Fonts</ulink> �ڡ����򸫤Ƥ���������</para>
diff --git a/ja_JP.eucJP/articles/ipsec-must/Makefile b/ja_JP.eucJP/articles/ipsec-must/Makefile
index c91818f369..dce2131d38 100644
--- a/ja_JP.eucJP/articles/ipsec-must/Makefile
+++ b/ja_JP.eucJP/articles/ipsec-must/Makefile
@@ -1,5 +1,9 @@
+#
 # $FreeBSD$
-# Original revision: 1.4
+#
+# Article: Independent Verification of IPsec Functionality in FreeBSD
+#
+# Original revision: 1.6
 
 DOC?= article
 
@@ -8,8 +12,9 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS= article.sgml
+SRCS=	article.sgml
 
+URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ja_JP.eucJP/articles/ipsec-must/article.sgml b/ja_JP.eucJP/articles/ipsec-must/article.sgml
index 8becfc7034..ce8b9b249f 100644
--- a/ja_JP.eucJP/articles/ipsec-must/article.sgml
+++ b/ja_JP.eucJP/articles/ipsec-must/article.sgml
@@ -3,7 +3,7 @@
     The FreeBSD Japanese Documentation Project
 
     $FreeBSD$
-    Original revision: 1.12
+    Original revision: 1.15
 -->
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
@@ -38,7 +38,7 @@
     </abstract>
   </articleinfo>
 
-  <sect1>
+  <sect1 id="problem">
     <title>����</title>
 
     <para>�ޤ���<link linkend="ipsec-install"><emphasis>IPsec</emphasis>
@@ -50,7 +50,7 @@
       ���������������Ω���Ƹ��ڤ��뤳�Ȥϲ�ǽ�ʤΤǤ��礦��?</para>
   </sect1>
 
-  <sect1>
+  <sect1 id="solution">
     <title>�����ˡ</title>
 
     <para>�ǽ�ˡ��Ź�˻Ȥ��Ƥ�����������ˤĤ��ƹͤ��ޤ���</para>
@@ -105,7 +105,7 @@
     </sect2>
   </sect1>
 
-  <sect1>
+  <sect1 id="experiment">
     <title>�¸�</title>
 
     <para>�Ǥϡ��¸����Ƥߤޤ��礦��</para>
@@ -193,7 +193,7 @@ Expected value for L=8 is 7.1836656
       IPsec ��³�����ꤹ��Ф褤�Ϥ��Ǥ���</para>
 
     <para>FreeBSD �� IPsec ��¹Ԥ������Ū�ʥ����ɤ�
-      <ulink url="../../books/handbook/ipsec.html">FreeBSD
+      <ulink url="&url.books.handbook;/ipsec.html">FreeBSD
         �ϥ�ɥ֥å�</ulink>���󶡤���Ƥ��ޤ���</para>
   </sect1>
 
diff --git a/ja_JP.eucJP/articles/multi-os/Makefile b/ja_JP.eucJP/articles/multi-os/Makefile
index 621b034154..bb708815e9 100644
--- a/ja_JP.eucJP/articles/multi-os/Makefile
+++ b/ja_JP.eucJP/articles/multi-os/Makefile
@@ -1,15 +1,19 @@
+#
 # $FreeBSD$
-# Original revision: 1.10
+#
+# Article: Installing and Using FreeBSD With Other Operating Systems
+#
+# Original revision: 1.12
 
 DOC?= article
 
 FORMATS?= html
+WITH_ARTICLE_TOC?= YES
 
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS= article.sgml
+SRCS=	article.sgml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
-
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ja_JP.eucJP/articles/multi-os/article.sgml b/ja_JP.eucJP/articles/multi-os/article.sgml
index 0bb4e1463f..6fa55825e5 100644
--- a/ja_JP.eucJP/articles/multi-os/article.sgml
+++ b/ja_JP.eucJP/articles/multi-os/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.37
+     Original revision: 1.39
      $FreeBSD$
 -->
 <!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -68,7 +68,7 @@
       ��¸�Υѡ��ƥ������ˤ���ǡ�����������Ȥˤʤ꤫�ͤޤ���
       ���������ϡ��ɥǥ������������� DOS �������Ƥ���褦�Ǥ���С�
       (FreeBSD CDROM ����� <filename>\TOOLS</filename> �ǥ��쥯�ȥꡢ
-      ���뤤�� <ulink URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools/">ftp
+      ���뤤�� <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools/">ftp
       </ulink> ��������Ǥ���) FIPS �桼�ƥ���ƥ������Ω�Ĥ��ȤǤ��礦��
       ���Υġ����Ȥ��С��ǡ������˲����뤳�Ȥʤ��ϡ��ɥǥ�������
       �ѡ��ƥ��������ڤ�ľ�����Ȥ��Ǥ��ޤ���
@@ -115,7 +115,7 @@
 	    LILO ��ȤäƤ��� Linux ��ư���뤳�Ȥ��Ǥ��ޤ���
 	    &os2; Boot Manager �� Linux ��ư��������ˡ�ξܺ٤ϡ�
 	    ��������
-	    <ulink URL="http://www.linuxresources.com/LDP/HOWTO/HOWTO-INDEX.html">Linux HOWTO</ulink>
+	    <ulink url="http://www.linuxresources.com/LDP/HOWTO/HOWTO-INDEX.html">Linux HOWTO</ulink>
 	    �򻲾Ȥ��Ƥ���������</para>
 	</listitem>
       </varlistentry>
@@ -131,7 +131,7 @@
             �������륭�����Ѥ��Ƶ�ư���� OS �����򤹤뤳�Ȥ��Ǥ��ޤ���
 	    ����ϡ�FreeBSD CD-ROM ��
 	    <filename class="directory">\TOOLS</filename> �ǥ��쥯�ȥꡢ
-	    ���뤤�� <ulink URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools/">
+	    ���뤤�� <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools/">
 	      ftp</ulink> �˼�Ͽ����Ƥ��ޤ���</para>
 	</listitem>
       </varlistentry>
@@ -205,7 +205,7 @@
 	<para>���� Linux �򥤥󥹥ȡ��뤷�ޤ���
           ���٤Ƥ� Linux �ǥ����ȥ�ӥ塼�����ˤĤ��Ƴ�ǧ�����櫓�ǤϤ���ޤ��󤬡�
 	  ���ʤ��Ȥ�
-	  <ulink URL="http://www.slackware.com">Slackware</ulink>
+	  <ulink url="http://www.slackware.com">Slackware</ulink>
 	  �ˤ� LILO (<xref linkend="ch2"> ����)
 	  ���ޤޤ�Ƥ��ޤ���Linux �� <command>fdisk</command>
           ���ޥ�ɤ�Ȥäơ��ϡ��ɥǥ��������ڤ�ʬ����Ȥ����顢
@@ -324,7 +324,7 @@ D: 1         A    PRI DOS                    420     FAT**    60%
       ���Τ��ᡢ�֡��ȥޥ͡�����κƥ��󥹥ȡ��뤬ɬ�פˤʤ�ޤ���
       Boot Easy �ϡ�CDROM ��
       <filename class="directory">\TOOLS</filename> �ǥ��쥯�ȥꤢ�뤤��
-      <ulink URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools/">ftp</ulink>
+      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools/">ftp</ulink>
       �����Ȥ˴ޤޤ�� <filename>BOOTINST.EXE</filename> �桼�ƥ���ƥ����Ѥ��ơ�
       �ƥ��󥹥ȡ��뤹�뤳�Ȥ���ǽ�Ǥ���
       �ޤ������󥹥ȡ���Υѡ��ƥ�����󥨥ǥ�����Ȥä�
@@ -397,18 +397,18 @@ D: 1         A    PRI DOS                    420     FAT**    60%
 
     <para>�ϡ��ɥǥ��������ʣ���� OS ��Ʊ�蘆������ˡ�ˤĤ���
       ��갷�äƤ��� <ulink
-	URL="http://www.linuxresources.com/LDP/HOWTO/HOWTO-INDEX.html">Linux
+	url="http://www.linuxresources.com/LDP/HOWTO/HOWTO-INDEX.html">Linux
 	HOW-TO</ulink> �ϡ��������󤢤�ޤ���</para>
 
-    <para><ulink URL="http://www.linuxresources.com/LDP/HOWTO/mini/Linux+DOS+Win95+OS2.html">
+    <para><ulink url="http://www.linuxresources.com/LDP/HOWTO/mini/Linux+DOS+Win95+OS2.html">
         Linux+DOS+Win95+OS2 mini-HOWTO</ulink> �ˤϡ�
       &os2; �֡��ȥޥ͡�����ξܺ٤�����ˡ���񤫤�Ƥ��ޤ����ޤ���
-      <ulink URL="http://www.linuxresources.com/LDP/HOWTO/mini/Linux+FreeBSD.html">
+      <ulink url="http://www.linuxresources.com/LDP/HOWTO/mini/Linux+FreeBSD.html">
         Linux+FreeBSD mini-HOWTO</ulink> ��Ʊ�ͤ˻��ͤȤʤ�Ǥ��礦��
-      ����ˡ�<ulink URL="http://www.in.net/~jkatz/win95/Linux-HOWTO.html">Linux-HOWTO</ulink>
+      ����ˡ�<ulink url="http://www.in.net/~jkatz/win95/Linux-HOWTO.html">Linux-HOWTO</ulink>
       �Ȥ��������Ȥ⤢��ޤ���</para>
 
-    <para><ulink URL="http://www.tburke.net/info/ntldr/ntldr_hacking_guide.htm">&windowsnt;
+    <para><ulink url="http://www.tburke.net/info/ntldr/ntldr_hacking_guide.htm">&windowsnt;
 	Loader Hacking Guide</ulink> �ˤϡ�
       &windowsnt;��&windows; 95��DOS ��¾�� OS
       �ȥޥ���֡��Ȥ�����ˡ�ˤĤ��Ƥξ��󤬽񤫤�Ƥ��ޤ���</para>
@@ -420,7 +420,7 @@ D: 1         A    PRI DOS                    420     FAT**    60%
       �ˤ����Τ⻲�ͤˤʤ�Ǥ��礦��</para>
 
     <para>�Ǹ�ˡ�
-      ���ۤ���Ƥ��륫���ͥ륽���� (<ulink URL="file://localhost/usr/src/sys/i386/boot/biosboot/README.386BSD">/usr/src/sys/i386/boot/biosboot/README.386BSD</ulink>
+      ���ۤ���Ƥ��륫���ͥ륽���� (<ulink url="file://localhost/usr/src/sys/i386/boot/biosboot/README.386BSD">/usr/src/sys/i386/boot/biosboot/README.386BSD</ulink>
       ��Ÿ������Ƥ��ޤ�) �˴ޤޤ�Ƥ��롢FreeBSD
       �����ͥ��ʸ��⸫��Ȥ��ʤ��褦�ˤ��Ƥ���������</para>
   </sect1>
diff --git a/ja_JP.eucJP/articles/problem-reports/Makefile b/ja_JP.eucJP/articles/problem-reports/Makefile
index 5aceb30fb2..6a73d46c6f 100644
--- a/ja_JP.eucJP/articles/problem-reports/Makefile
+++ b/ja_JP.eucJP/articles/problem-reports/Makefile
@@ -1,17 +1,21 @@
+#
 # $FreeBSD$
-# Original revision: 1.4
+#
+# Article: Writing FreeBSD Problem Reports
+#
+# Original revision: 1.6
 
 DOC?= article
 
 FORMATS?= html
+WITH_ARTICLE_TOC?= YES
 
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-WITH_ARTICLE_TOC?=YES
-
-SRCS= article.sgml
+SRCS=	article.sgml
 
+URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ja_JP.eucJP/articles/zip-drive/Makefile b/ja_JP.eucJP/articles/zip-drive/Makefile
index e85e0f02f7..1c2f7a0648 100644
--- a/ja_JP.eucJP/articles/zip-drive/Makefile
+++ b/ja_JP.eucJP/articles/zip-drive/Makefile
@@ -1,5 +1,9 @@
+#
 # $FreeBSD$
-# Original revision: 1.3
+#
+# Article: IOmega ZIP Drivse
+#
+# Original revision: 1.4
 
 DOC?= article
 
@@ -8,8 +12,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS= article.sgml
+SRCS=	article.sgml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
-
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ja_JP.eucJP/articles/zip-drive/article.sgml b/ja_JP.eucJP/articles/zip-drive/article.sgml
index 71a6ca035d..407939d640 100644
--- a/ja_JP.eucJP/articles/zip-drive/article.sgml
+++ b/ja_JP.eucJP/articles/zip-drive/article.sgml
@@ -2,7 +2,7 @@
     The FreeBSD Documentation Project
     The FreeBSD Japanese Documentation Project
 
-    Original revision: 1.12
+    Original revision: 1.15
     $FreeBSD$
 -->
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -186,7 +186,9 @@ SCSI-2 Device</programlisting>
     <para>vpo ��ɸ��Υ����ͥ륪�ץ����ǤϤʤ�����
       (FreeBSD 3.2 ����)
       �ǥХ�������Ѳ�ǽ�ˤ��뤿��˥����ͥ��ƹ��ۤ���ɬ�פ�����ޤ���
-      �����ͥ�ƹ��ۤξܺ٤ʼ��ˤĤ��Ƥ�¾�Υ����������������ޤ���
+      �����ͥ�ƹ��ۤξܺ٤ʼ��ˤĤ��Ƥ�
+      <ulink url="&url.books.handbook;/kernelconfig.html">&os;
+	�ϥ�ɥ֥å�</ulink>��������������
       �ʲ��ϡ�vpo �ɥ饤�Ф���Ѳ�ǽ�ˤ��뤿�����ޤ��ʼ��Ǥ���</para>
 
     <orderedlist>
@@ -331,6 +333,6 @@ install</userinput></screen>
       �Υե����륷���ƥ���������ˤ� &man.newfs.8; �򻲾Ȥ��Ƥ���������
       �����������Υǥ������� FreeBSD ����FreeBSD
       ��ǧ�����뤴�������� &unix; ��������Τߤˤ����ƻ��Ѥ��뤳�Ȥ��Ǥ��ޤ�
-      (DOS �� &windows; ��Ǥϻ��ѤǤ��ޤ���)��</para>
+      (&ms-dos; �� &windows; ��Ǥϻ��ѤǤ��ޤ���)��</para>
   </sect1>
 </article>