diff --git a/ja/Makefile b/ja/Makefile
index 8f233f3494..4fed949750 100644
--- a/ja/Makefile
+++ b/ja/Makefile
@@ -1,11 +1,12 @@
-# $FreeBSD: www/ja/Makefile,v 1.42 2000/10/02 09:16:04 kuriyama Exp $
+# $FreeBSD: www/ja/Makefile,v 1.43 2000/11/07 08:18:36 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.54
+# Original revision: 1.55
 
-LOCALTOP= .
-
-.if exists(${LOCALTOP}/Makefile.conf)
-.include "${LOCALTOP}/Makefile.conf"
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
 .endif
 
 # These are turned into validated, normalized HTML files.
@@ -71,4 +72,4 @@ WEBDIR=		data/ja
 ### Revision checking
 REVCHECK=	yes
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/Makefile.inc b/ja/Makefile.inc
index e368a83bab..b3223dfa2b 100644
--- a/ja/Makefile.inc
+++ b/ja/Makefile.inc
@@ -1,5 +1,6 @@
-# $FreeBSD: www/ja/Makefile.inc,v 1.7 1999/09/06 07:03:14 peter Exp $
+# $FreeBSD: www/ja/Makefile.inc,v 1.8 1999/09/07 15:15:44 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.7
+# Original revision: 1.8
 
 WEBBASE?=	/data/ja
+WEB_PREFIX?=	${.CURDIR}/../..
diff --git a/ja/alpha/Makefile b/ja/alpha/Makefile
index 3594772c09..2974129804 100644
--- a/ja/alpha/Makefile
+++ b/ja/alpha/Makefile
@@ -1,11 +1,12 @@
-# $FreeBSD: www/ja/alpha/Makefile,v 1.10 1999/12/23 01:15:46 kuriyama Exp $
+# $FreeBSD: www/ja/alpha/Makefile,v 1.11 2000/10/02 09:16:05 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.6
+# Original revision: 1.7
 
-LOCALTOP= ..
-
-.if exists(${LOCALTOP}/Makefile.conf)
-.include "${LOCALTOP}/Makefile.conf"
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
 .endif
 
 DOCS=   alpha.sgml
@@ -15,4 +16,4 @@ INDEXLINK=alpha.html
 ### Revision checking
 REVCHECK=	yes
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/commercial/Makefile b/ja/commercial/Makefile
index 6538241025..69b09313b8 100644
--- a/ja/commercial/Makefile
+++ b/ja/commercial/Makefile
@@ -1,11 +1,12 @@
-# $FreeBSD: www/ja/commercial/Makefile,v 1.11 2000/10/02 09:16:05 kuriyama Exp $
+# $FreeBSD: www/ja/commercial/Makefile,v 1.12 2000/10/05 16:31:17 hrs Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.13
+# Original revision: 1.14
 
-LOCALTOP= ..
-
-.if exists(${LOCALTOP}/Makefile.conf)
-.include "${LOCALTOP}/Makefile.conf"
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
 .endif
 
 PERL=	perl5
@@ -23,4 +24,4 @@ INDEXLINK=commercial.html
 ### Revision checking
 REVCHECK=	yes
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/conspectus/Makefile b/ja/conspectus/Makefile
index 2fc00bd3a2..07e5506bbc 100644
--- a/ja/conspectus/Makefile
+++ b/ja/conspectus/Makefile
@@ -1,11 +1,12 @@
-# $FreeBSD: www/ja/conspectus/Makefile,v 1.1 2000/06/18 23:06:42 kuriyama Exp $
+# $FreeBSD: www/ja/conspectus/Makefile,v 1.2 2000/10/02 09:16:05 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.1
+# Original revision: 1.2
 
-LOCALTOP= ..
-
-.if exists(${LOCALTOP}/Makefile.conf)
-.include "${LOCALTOP}/Makefile.conf"
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
 .endif
 
 DOCS=   index.sgml 
@@ -16,4 +17,4 @@ DOCS=   index.sgml
 ### Revision checking
 REVCHECK=	yes
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/conspectus/Makefile.inc b/ja/conspectus/Makefile.inc
index 03460c3c77..e663453ed6 100644
--- a/ja/conspectus/Makefile.inc
+++ b/ja/conspectus/Makefile.inc
@@ -1,5 +1,6 @@
-# $FreeBSD$
+# $FreeBSD: www/ja/conspectus/Makefile.inc,v 1.1 2000/06/18 23:06:42 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.1
+# Original revision: 1.2
 
 WEBBASE?=	/data/ja/conspectus
+WEB_PREFIX?=	${.CURDIR}/../../..
diff --git a/ja/copyright/Makefile b/ja/copyright/Makefile
index 906348a7b2..9e15a7df67 100644
--- a/ja/copyright/Makefile
+++ b/ja/copyright/Makefile
@@ -1,11 +1,12 @@
-# $FreeBSD: www/ja/copyright/Makefile,v 1.12 1999/12/23 01:15:47 kuriyama Exp $
+# $FreeBSD: www/ja/copyright/Makefile,v 1.13 2000/10/02 09:16:06 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.9
+# Original revision: 1.10
 
-LOCALTOP= ..
-
-.if exists(${LOCALTOP}/Makefile.conf)
-.include "${LOCALTOP}/Makefile.conf"
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
 .endif
 
 DOCS=	license.sgml
@@ -39,4 +40,4 @@ CVS_OPT+=	-R
 ### Revision checking
 REVCHECK=	yes
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/docproj/Makefile b/ja/docproj/Makefile
index 20ac0c8148..91c4b1b1cc 100644
--- a/ja/docproj/Makefile
+++ b/ja/docproj/Makefile
@@ -1,11 +1,12 @@
-# $FreeBSD: www/ja/docproj/Makefile,v 1.11 1999/12/23 01:15:48 kuriyama Exp $
+# $FreeBSD: www/ja/docproj/Makefile,v 1.12 2000/10/02 09:16:06 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.7
+# Original revision: 1.8
 
-LOCALTOP= ..
-
-.if exists(${LOCALTOP}/Makefile.conf)
-.include "${LOCALTOP}/Makefile.conf"
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
 .endif
 
 DOCS=  current.sgml 
@@ -21,4 +22,4 @@ INDEXLINK= docproj.html
 ### Revision checking
 REVCHECK=	yes
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/gallery/Makefile b/ja/gallery/Makefile
index b5734c8ba6..e2e35cdeef 100644
--- a/ja/gallery/Makefile
+++ b/ja/gallery/Makefile
@@ -1,11 +1,12 @@
-# $FreeBSD: www/ja/gallery/Makefile,v 1.11 2000/10/02 07:54:40 kuriyama Exp $
+# $FreeBSD: www/ja/gallery/Makefile,v 1.12 2000/10/02 09:16:06 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.10
+# Original revision: 1.11
 
-LOCALTOP= ..
-
-.if exists(${LOCALTOP}/Makefile.conf)
-.include "${LOCALTOP}/Makefile.conf"
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
 .endif
 
 DOCS = gallery.sgml
@@ -23,4 +24,4 @@ gallery.inc: ../../en/gallery/gallery.db gallery.sgml
 ### Revision checking
 REVCHECK=	yes
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/internal/Makefile b/ja/internal/Makefile
index a2302267e9..4528652890 100644
--- a/ja/internal/Makefile
+++ b/ja/internal/Makefile
@@ -1,11 +1,12 @@
-# $FreeBSD: www/ja/internal/Makefile,v 1.14 2000/05/07 01:54:44 kuriyama Exp $
+# $FreeBSD: www/ja/internal/Makefile,v 1.15 2000/10/02 09:16:07 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.22
+# Original revision: 1.23
 
-LOCALTOP= ..
-
-.if exists(${LOCALTOP}/Makefile.conf)
-.include "${LOCALTOP}/Makefile.conf"
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
 .endif
 
 # DOCS=   photos.sgml     
@@ -23,4 +24,4 @@ INDEXLINK=	internal.html
 ### Revision checking
 REVCHECK=	yes
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/java/Makefile b/ja/java/Makefile
index 0c6032889a..e8bd8f257f 100644
--- a/ja/java/Makefile
+++ b/ja/java/Makefile
@@ -1,12 +1,12 @@
-# $FreeBSD: www/ja/java/Makefile,v 1.7 2000/10/02 09:16:07 kuriyama Exp $
-
+# $FreeBSD: www/ja/java/Makefile,v 1.8 2000/11/07 05:13:19 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.2
+# Original revision: 1.3
 
-LOCALTOP= ..
-
-.if exists(${LOCALTOP}/Makefile.conf)
-.include "${LOCALTOP}/Makefile.conf"
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
 .endif
 
 SUBDIR =	dists
@@ -23,4 +23,4 @@ DOCS+=  newsflash.sgml
 ### Revision checking
 REVCHECK= YES
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/java/Makefile.inc b/ja/java/Makefile.inc
index b6feeb1ded..9326be65c4 100644
--- a/ja/java/Makefile.inc
+++ b/ja/java/Makefile.inc
@@ -1,6 +1,6 @@
-# $FreeBSD: www/ja/java/Makefile.inc,v 1.1 2000/04/27 02:05:06 kuriyama Exp $
-
+# $FreeBSD: www/ja/java/Makefile.inc,v 1.2 2000/04/28 12:21:21 phantom Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.1
+# Original revision: 1.2
 
-WEBBASE?= /data/ja/java
+WEBBASE?=	/data/ja/java
+WEB_PREFIX?=	${.CURDIR}/../../..
diff --git a/ja/java/dists/Makefile b/ja/java/dists/Makefile
index 8a65687c38..ddedd370a6 100644
--- a/ja/java/dists/Makefile
+++ b/ja/java/dists/Makefile
@@ -1,9 +1,13 @@
-# $FreeBSD: www/ja/java/dists/Makefile,v 1.3 2000/10/02 09:16:09 kuriyama Exp $
-
+# $FreeBSD: www/ja/java/dists/Makefile,v 1.4 2000/11/07 05:13:20 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.3
+# Original revision: 1.4
 
-LOCALTOP= ../..
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=	10.sgml
 DOCS+=	11.sgml
@@ -14,4 +18,4 @@ DOCS+=	index.sgml
 ### Revision checking
 REVCHECK= YES
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/news/1996/Makefile b/ja/news/1996/Makefile
index 66d6f8bba2..331f05992c 100644
--- a/ja/news/1996/Makefile
+++ b/ja/news/1996/Makefile
@@ -1,11 +1,12 @@
-# $FreeBSD: www/ja/news/1996/Makefile,v 1.3 2000/10/02 09:16:10 kuriyama Exp $
+# $FreeBSD: www/ja/news/1996/Makefile,v 1.4 2000/10/19 19:05:13 hrs Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.2
+# Original revision: 1.3
 
-LOCALTOP= ../..
-
-.if exists(${LOCALTOP}/Makefile.conf)
-.include "${LOCALTOP}/Makefile.conf"
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
 .endif
 
 DOCS=	index.sgml
@@ -13,4 +14,4 @@ DOCS=	index.sgml
 ### Revision checking
 REVCHECK=	YES
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/news/1997/Makefile b/ja/news/1997/Makefile
index 2f3183f1b9..fe2a403f5c 100644
--- a/ja/news/1997/Makefile
+++ b/ja/news/1997/Makefile
@@ -1,11 +1,12 @@
-# $FreeBSD: www/ja/news/1997/Makefile,v 1.3 2000/10/02 09:16:10 kuriyama Exp $
+# $FreeBSD: www/ja/news/1997/Makefile,v 1.4 2000/10/19 19:05:13 hrs Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.2
+# Original revision: 1.3
 
-LOCALTOP= ../..
-
-.if exists(${LOCALTOP}/Makefile.conf)
-.include "${LOCALTOP}/Makefile.conf"
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
 .endif
 
 DOCS=	index.sgml
@@ -13,4 +14,4 @@ DOCS=	index.sgml
 ### Revision checking
 REVCHECK=	YES
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/news/Makefile b/ja/news/Makefile
index 24438c06c8..84edd014e1 100644
--- a/ja/news/Makefile
+++ b/ja/news/Makefile
@@ -1,11 +1,12 @@
-# $FreeBSD: www/ja/news/Makefile,v 1.21 2000/10/02 09:16:10 kuriyama Exp $
+# $FreeBSD: www/ja/news/Makefile,v 1.22 2000/11/07 07:58:03 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.22
+# Original revision: 1.23
 
-LOCALTOP= ..
-
-.if exists(${LOCALTOP}/Makefile.conf)
-.include "${LOCALTOP}/Makefile.conf"
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
 .endif
 
 # quick news letter
@@ -44,4 +45,4 @@ SUBDIR+= 	1997
 ### Revision checking
 REVCHECK=	YES
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/news/Makefile.inc b/ja/news/Makefile.inc
index 4771330f5d..fb7812a0b2 100644
--- a/ja/news/Makefile.inc
+++ b/ja/news/Makefile.inc
@@ -1,5 +1,6 @@
-# $FreeBSD: www/en/news/Makefile.inc,v 1.1 2000/03/22 16:20:52 phantom Exp $
+# $FreeBSD: www/ja/news/Makefile.inc,v 1.1 2000/05/12 15:34:39 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.1
+# Original revision: 1.2
 
-WEBBASE?= /data/ja/news
+WEBBASE?=	/data/ja/news
+WEB_PREFIX?=	${.CURDIR}/../../..
diff --git a/ja/ports/Makefile b/ja/ports/Makefile
index 24fabf9007..d5e0b0438e 100644
--- a/ja/ports/Makefile
+++ b/ja/ports/Makefile
@@ -1,10 +1,13 @@
-# $FreeBSD: www/ja/ports/Makefile,v 1.19 2000/10/02 07:54:40 kuriyama Exp $
+# $FreeBSD: www/ja/ports/Makefile,v 1.20 2000/11/07 08:01:02 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.29
+# Original revision: 1.30
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 .if exists(../../en/ports/Makefile.inc)
 .include "../../en/ports/Makefile.inc"
 .endif
@@ -74,4 +77,4 @@ all install clean:
 	(cd ${.CURDIR} && ${MAKE}  ${MAKEFLAGS} -f Makefile.inc0 ${.TARGET})
 
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/ports/Makefile.inc0 b/ja/ports/Makefile.inc0
index 1ef388e332..8df51c24e8 100644
--- a/ja/ports/Makefile.inc0
+++ b/ja/ports/Makefile.inc0
@@ -1,12 +1,14 @@
-# $FreeBSD: www/ja/ports/Makefile.inc0,v 1.1 1999/11/15 21:58:16 kuriyama Exp $
+# $FreeBSD: www/ja/ports/Makefile.inc0,v 1.2 2000/10/03 11:10:50 hrs Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.3
+# Original revision: 1.4
 
-.if exists(${.CURDIR}/../Makefile.conf)
+.if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
-
-.if exists(${.CURDIR}/../../en/ports/Makefile.inc)
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+.if exists(../../en/ports/Makefile.inc)
 .include "../../en/ports/Makefile.inc"
 .endif
 
@@ -14,5 +16,4 @@
 .include "Makefile.gen"
 .endif
 
-
-.include "../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/projects/Makefile b/ja/projects/Makefile
index 04afa7602e..bf79151757 100644
--- a/ja/projects/Makefile
+++ b/ja/projects/Makefile
@@ -1,11 +1,12 @@
-# $FreeBSD: www/ja/projects/Makefile,v 1.9 1999/12/23 01:15:56 kuriyama Exp $
+# $FreeBSD: www/ja/projects/Makefile,v 1.10 2000/10/02 09:16:11 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.6
+# Original revision: 1.7
 
-LOCALTOP= ..
-
-.if exists(${LOCALTOP}/Makefile.conf)
-.include "${LOCALTOP}/Makefile.conf"
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
 .endif
 
 DOCS=	projects.sgml
@@ -17,4 +18,4 @@ INDEXLINK= projects.html
 ### Revision checking
 REVCHECK=	yes
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/releases/2.1.5R/Makefile b/ja/releases/2.1.5R/Makefile
index 3d6a54cf31..0115af55dd 100644
--- a/ja/releases/2.1.5R/Makefile
+++ b/ja/releases/2.1.5R/Makefile
@@ -1,8 +1,13 @@
-# $FreeBSD: www/ja/releases/2.1.5R/Makefile,v 1.3 1999/12/23 01:15:58 kuriyama Exp $
+# $FreeBSD: www/ja/releases/2.1.5R/Makefile,v 1.4 2000/10/02 09:16:11 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.1
+# Original revision: 1.2
 
-LOCALTOP= ../..
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 #DOCS=	announce.sgml notes.sgml
 DOCS=	notes.sgml
@@ -10,4 +15,4 @@ DOCS=	notes.sgml
 ### Revision checking
 REVCHECK=	YES
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/releases/2.1.6R/Makefile b/ja/releases/2.1.6R/Makefile
index 128187e8b8..06c4f5ef74 100644
--- a/ja/releases/2.1.6R/Makefile
+++ b/ja/releases/2.1.6R/Makefile
@@ -1,8 +1,13 @@
-# $FreeBSD: www/ja/releases/2.1.6R/Makefile,v 1.3 1999/12/23 01:15:59 kuriyama Exp $
+# $FreeBSD: www/ja/releases/2.1.6R/Makefile,v 1.4 2000/10/02 09:16:12 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.2
+# Original revision: 1.3
 
-LOCALTOP= ../..
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 #DOCS=	announce.sgml notes.sgml security.sgml
 DOCS=	notes.sgml security.sgml
@@ -10,4 +15,4 @@ DOCS=	notes.sgml security.sgml
 ### Revision checking
 REVCHECK=	YES
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/releases/2.1.7R/Makefile b/ja/releases/2.1.7R/Makefile
index ce2aa34e68..bb414cdca3 100644
--- a/ja/releases/2.1.7R/Makefile
+++ b/ja/releases/2.1.7R/Makefile
@@ -1,8 +1,13 @@
-# $FreeBSD: www/ja/releases/2.1.7R/Makefile,v 1.3 1999/12/23 01:16:00 kuriyama Exp $
+# $FreeBSD: www/ja/releases/2.1.7R/Makefile,v 1.4 2000/10/02 09:16:12 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.1
+# Original revision: 1.2
 
-LOCALTOP= ../..
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 #DOCS=	announce.sgml notes.sgml
 DOCS=	notes.sgml
@@ -10,4 +15,4 @@ DOCS=	notes.sgml
 ### Revision checking
 REVCHECK=	YES
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/releases/2.2.1R/Makefile b/ja/releases/2.2.1R/Makefile
index 4c2b355a2e..8cebdf0f28 100644
--- a/ja/releases/2.2.1R/Makefile
+++ b/ja/releases/2.2.1R/Makefile
@@ -1,12 +1,17 @@
-# $FreeBSD: www/ja/releases/2.2.1R/Makefile,v 1.3 1999/12/23 01:16:01 kuriyama Exp $
+# $FreeBSD: www/ja/releases/2.2.1R/Makefile,v 1.4 2000/10/02 09:16:14 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.1
+# Original revision: 1.2
 
-LOCALTOP= ../..
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=	notes.sgml
 
 ### Revision checking
 REVCHECK=	YES
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/releases/2.2.2R/Makefile b/ja/releases/2.2.2R/Makefile
index 52f35b44eb..6f47f547a6 100644
--- a/ja/releases/2.2.2R/Makefile
+++ b/ja/releases/2.2.2R/Makefile
@@ -1,12 +1,17 @@
-# $FreeBSD: www/ja/releases/2.2.2R/Makefile,v 1.3 1999/12/23 01:16:01 kuriyama Exp $
+# $FreeBSD: www/ja/releases/2.2.2R/Makefile,v 1.4 2000/10/02 09:16:15 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.2
+# Original revision: 1.3
 
-LOCALTOP= ../..
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=	notes.sgml errata.sgml
 
 ### Revision checking
 REVCHECK=	YES
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/releases/2.2.5R/Makefile b/ja/releases/2.2.5R/Makefile
index a5fe5ae814..50713fe85c 100644
--- a/ja/releases/2.2.5R/Makefile
+++ b/ja/releases/2.2.5R/Makefile
@@ -1,12 +1,17 @@
-# $FreeBSD: www/ja/releases/2.2.5R/Makefile,v 1.4 1999/12/23 01:16:02 kuriyama Exp $
+# $FreeBSD: www/ja/releases/2.2.5R/Makefile,v 1.5 2000/10/02 09:16:15 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.2
+# Original revision: 1.3
 
-LOCALTOP= ../..
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=	announce.sgml notes.sgml errata.sgml
 
 ### Revision checking
 REVCHECK=	YES
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/releases/2.2.6R/Makefile b/ja/releases/2.2.6R/Makefile
index 6ade6cde45..ce400d71a1 100644
--- a/ja/releases/2.2.6R/Makefile
+++ b/ja/releases/2.2.6R/Makefile
@@ -1,12 +1,17 @@
-# $FreeBSD: www/ja/releases/2.2.6R/Makefile,v 1.5 1999/12/23 01:16:03 kuriyama Exp $
+# $FreeBSD: www/ja/releases/2.2.6R/Makefile,v 1.6 2000/10/02 09:16:16 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.1
+# Original revision: 1.2
 
-LOCALTOP= ../..
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=	announce.sgml notes.sgml errata.sgml
 
 ### Revision checking
 REVCHECK=	YES
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/releases/2.2.7R/Makefile b/ja/releases/2.2.7R/Makefile
index eb49cfc4a6..c95b5936bd 100644
--- a/ja/releases/2.2.7R/Makefile
+++ b/ja/releases/2.2.7R/Makefile
@@ -1,12 +1,17 @@
-# $FreeBSD: www/ja/releases/2.2.7R/Makefile,v 1.5 1999/12/23 01:16:04 kuriyama Exp $
+# $FreeBSD: www/ja/releases/2.2.7R/Makefile,v 1.6 2000/10/02 09:16:16 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.1
+# Original revision: 1.2
 
-LOCALTOP= ../..
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=	announce.sgml notes.sgml errata.sgml
 
 ### Revision checking
 REVCHECK=	YES
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/releases/2.2.8R/Makefile b/ja/releases/2.2.8R/Makefile
index a627f50c56..d68c4a004c 100644
--- a/ja/releases/2.2.8R/Makefile
+++ b/ja/releases/2.2.8R/Makefile
@@ -1,12 +1,17 @@
-# $FreeBSD: www/ja/releases/2.2.8R/Makefile,v 1.3 1999/12/23 01:16:05 kuriyama Exp $
+# $FreeBSD: www/ja/releases/2.2.8R/Makefile,v 1.4 2000/10/02 09:16:16 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.1
+# Original revision: 1.2
 
-LOCALTOP= ../..
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=	announce.sgml notes.sgml errata.sgml
 
 ### Revision checking
 REVCHECK=	YES
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/releases/2.2R/Makefile b/ja/releases/2.2R/Makefile
index fd9b7784bd..d08d10f27d 100644
--- a/ja/releases/2.2R/Makefile
+++ b/ja/releases/2.2R/Makefile
@@ -1,12 +1,17 @@
-# $FreeBSD: www/ja/releases/2.2R/Makefile,v 1.3 1999/12/23 01:16:06 kuriyama Exp $
+# $FreeBSD: www/ja/releases/2.2R/Makefile,v 1.4 2000/10/02 09:16:17 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.2
+# Original revision: 1.3
 
-LOCALTOP= ../..
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=	announce.sgml install-media.sgml notes.sgml
 
 ### Revision checking
 REVCHECK=	YES
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/releases/3.0R/Makefile b/ja/releases/3.0R/Makefile
index ee75030fdd..9723b06214 100644
--- a/ja/releases/3.0R/Makefile
+++ b/ja/releases/3.0R/Makefile
@@ -1,12 +1,17 @@
-# $FreeBSD: www/ja/releases/3.0R/Makefile,v 1.5 1999/12/23 01:16:07 kuriyama Exp $
+# $FreeBSD: www/ja/releases/3.0R/Makefile,v 1.6 2000/10/02 09:16:17 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.1
+# Original revision: 1.2
 
-LOCALTOP= ../..
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=	announce.sgml notes.sgml errata.sgml
 
 ### Revision checking
 REVCHECK=	YES
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/releases/3.1R/Makefile b/ja/releases/3.1R/Makefile
index c5ea3d1f7d..5c7c17e097 100644
--- a/ja/releases/3.1R/Makefile
+++ b/ja/releases/3.1R/Makefile
@@ -1,12 +1,17 @@
-# $FreeBSD: www/ja/releases/3.1R/Makefile,v 1.4 1999/12/23 01:16:08 kuriyama Exp $
+# $FreeBSD: www/ja/releases/3.1R/Makefile,v 1.5 2000/10/02 09:16:17 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.1
+# Original revision: 1.2
 
-LOCALTOP= ../..
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=	announce.sgml notes.sgml errata.sgml
 
 ### Revision checking
 REVCHECK=	YES
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/releases/3.2R/Makefile b/ja/releases/3.2R/Makefile
index 17be134c18..8c2f2fc58e 100644
--- a/ja/releases/3.2R/Makefile
+++ b/ja/releases/3.2R/Makefile
@@ -1,12 +1,17 @@
-# $FreeBSD: www/ja/releases/3.2R/Makefile,v 1.3 1999/12/23 01:16:09 kuriyama Exp $
+# $FreeBSD: www/ja/releases/3.2R/Makefile,v 1.4 2000/10/02 09:16:19 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.1
+# Original revision: 1.2
 
-LOCALTOP= ../..
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=	announce.sgml notes.sgml errata.sgml
 
 ### Revision checking
 REVCHECK=	YES
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/releases/3.3R/Makefile b/ja/releases/3.3R/Makefile
index 63eca95d05..ced01a51fc 100644
--- a/ja/releases/3.3R/Makefile
+++ b/ja/releases/3.3R/Makefile
@@ -1,12 +1,17 @@
-# $FreeBSD: www/ja/releases/3.3R/Makefile,v 1.3 1999/12/23 01:16:10 kuriyama Exp $
+# $FreeBSD: www/ja/releases/3.3R/Makefile,v 1.4 2000/10/02 09:16:20 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.1
+# Original revision: 1.2
 
-LOCALTOP= ../..
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=	announce.sgml notes.sgml errata.sgml
 
 ### Revision checking
 REVCHECK=	YES
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/releases/3.4R/Makefile b/ja/releases/3.4R/Makefile
index 126aebc059..59c65bf89f 100644
--- a/ja/releases/3.4R/Makefile
+++ b/ja/releases/3.4R/Makefile
@@ -1,12 +1,17 @@
-# $FreeBSD: www/ja/releases/3.4R/Makefile,v 1.3 2000/01/06 03:42:53 kuriyama Exp $
+# $FreeBSD: www/ja/releases/3.4R/Makefile,v 1.4 2000/10/02 09:16:20 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.1
+# Original revision: 1.2
 
-LOCALTOP= ../..
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=	announce.sgml notes.sgml errata.sgml
 
 ### Revision checking
 REVCHECK=	YES
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/releases/3.5R/Makefile b/ja/releases/3.5R/Makefile
index 9db9c044fe..bc39fa1559 100644
--- a/ja/releases/3.5R/Makefile
+++ b/ja/releases/3.5R/Makefile
@@ -1,12 +1,17 @@
-# $FreeBSD: www/ja/releases/3.5R/Makefile,v 1.2 2000/07/09 15:55:59 hrs Exp $
+# $FreeBSD: www/ja/releases/3.5R/Makefile,v 1.3 2000/10/02 09:16:20 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.1
+# Original revision: 1.2
 
-LOCALTOP= ../..
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=	announce.sgml notes.sgml errata.sgml
 
 ### Revision checking
 REVCHECK=	YES
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/releases/4.0R/Makefile b/ja/releases/4.0R/Makefile
index 2fca0f3f4c..12b473ac45 100644
--- a/ja/releases/4.0R/Makefile
+++ b/ja/releases/4.0R/Makefile
@@ -1,8 +1,13 @@
-# $FreeBSD: www/ja/releases/4.0R/Makefile,v 1.2 2000/06/29 00:06:24 motoyuki Exp $
+# $FreeBSD: www/ja/releases/4.0R/Makefile,v 1.3 2000/10/02 09:16:21 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.1
+# Original revision: 1.2
 
-LOCALTOP= ../..
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=	announce.sgml
 DOCS+=	notes.sgml
@@ -11,4 +16,4 @@ DOCS+=	errata.sgml
 ### Revision checking
 REVCHECK=	YES
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/releases/4.1.1R/Makefile b/ja/releases/4.1.1R/Makefile
index 915e7196ab..b447c681d3 100644
--- a/ja/releases/4.1.1R/Makefile
+++ b/ja/releases/4.1.1R/Makefile
@@ -1,8 +1,13 @@
-# $FreeBSD$
+# $FreeBSD: www/ja/releases/4.1.1R/Makefile,v 1.1 2000/10/05 16:31:18 hrs Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.1
+# Original revision: 1.2
 
-LOCALTOP= ../..
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=	announce.sgml
 DOCS+=	notes.sgml
@@ -11,4 +16,4 @@ DOCS+=	errata.sgml
 ### Revision checking
 REVCHECK=	YES
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/releases/4.1R/Makefile b/ja/releases/4.1R/Makefile
index 9daa7ec9c2..d7e62f6d41 100644
--- a/ja/releases/4.1R/Makefile
+++ b/ja/releases/4.1R/Makefile
@@ -1,8 +1,13 @@
-# $FreeBSD: www/ja/releases/4.1R/Makefile,v 1.2 2000/09/15 07:45:38 hrs Exp $
+# $FreeBSD: www/ja/releases/4.1R/Makefile,v 1.3 2000/10/02 09:16:21 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.1
+# Original revision: 1.2
 
-LOCALTOP= ../..
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=	announce.sgml
 DOCS+=	notes.sgml
@@ -11,4 +16,4 @@ DOCS+=	errata.sgml
 ### Revision checking
 REVCHECK=	YES
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/releases/Makefile b/ja/releases/Makefile
index 38d685db4f..6a06b56b43 100644
--- a/ja/releases/Makefile
+++ b/ja/releases/Makefile
@@ -1,11 +1,12 @@
-# $FreeBSD: www/ja/releases/Makefile,v 1.19 2000/10/02 09:16:11 kuriyama Exp $
+# $FreeBSD: www/ja/releases/Makefile,v 1.20 2000/10/05 16:31:17 hrs Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.25
 
-LOCALTOP= ..
-
-.if exists(${LOCALTOP}/Makefile.conf)
-.include "${LOCALTOP}/Makefile.conf"
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
 .endif
 
 DOCS?=	index.sgml snapshots.sgml
@@ -23,4 +24,4 @@ SUBDIR=
 ### Revision checking
 REVCHECK=	YES
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/releases/Makefile.inc b/ja/releases/Makefile.inc
index f0bc6487d2..4858dfd25e 100644
--- a/ja/releases/Makefile.inc
+++ b/ja/releases/Makefile.inc
@@ -1,6 +1,6 @@
-# $FreeBSD: www/ja/releases/Makefile.inc,v 1.3 1999/09/06 07:03:23 peter Exp $
+# $FreeBSD: www/ja/releases/Makefile.inc,v 1.4 1999/09/07 15:15:51 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.4
+# Original revision: 1.5
 
 WEBBASE?=	/data/ja/releases
-
+WEB_PREFIX?=	${.CURDIR}/../../..
diff --git a/ja/search/Makefile b/ja/search/Makefile
index 2cc7ca00f4..32d79b4620 100644
--- a/ja/search/Makefile
+++ b/ja/search/Makefile
@@ -1,11 +1,12 @@
-# $FreeBSD: www/ja/search/Makefile,v 1.9 2000/09/30 12:30:40 hrs Exp $
+# $FreeBSD: www/ja/search/Makefile,v 1.10 2000/10/02 09:16:21 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.7
+# Original revision: 1.8
 
-LOCALTOP= ..
-
-.if exists(${LOCALTOP}/Makefile.conf)
-.include "${LOCALTOP}/Makefile.conf"
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
 .endif
 
 # These are turned into validated, normalized HTML files.
@@ -28,4 +29,4 @@ site.sgml: ${.CURDIR}/../../en/search/site.map
 ### Revision checking
 REVCHECK=	YES
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/security/Makefile b/ja/security/Makefile
index 606e2e1bf2..bf700f7ef5 100644
--- a/ja/security/Makefile
+++ b/ja/security/Makefile
@@ -1,11 +1,12 @@
-# $FreeBSD: www/ja/security/Makefile,v 1.11 1999/12/23 01:16:13 kuriyama Exp $
+# $FreeBSD: www/ja/security/Makefile,v 1.12 2000/10/02 09:16:23 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.6
+# Original revision: 1.7
 
-LOCALTOP= ..
-
-.if exists(${LOCALTOP}/Makefile.conf)
-.include "${LOCALTOP}/Makefile.conf"
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
 .endif
 
 DOCS=  
@@ -16,4 +17,4 @@ INDEXLINK= security.html
 ### Revision checking
 REVCHECK=	YES
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/tutorials/Makefile b/ja/tutorials/Makefile
index 06f3543c87..4e346029aa 100644
--- a/ja/tutorials/Makefile
+++ b/ja/tutorials/Makefile
@@ -1,12 +1,17 @@
 #
-# $FreeBSD: www/ja/tutorials/Makefile,v 1.6 2000/10/02 07:54:41 kuriyama Exp $
+# $FreeBSD: www/ja/tutorials/Makefile,v 1.7 2000/10/02 09:16:24 kuriyama Exp $
 #
-# Original revision: 1.9
+# Original revision: 1.10
 #
 # Build the FreeBSD tutorials/articles outside of the www tree, and then
 # install them in to the right place.
 
-LOCALTOP= ..
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS = index.sgml
 
@@ -24,4 +29,4 @@ all afterinstall:
 ### Revision checking
 REVCHECK=	YES
 
-.include "${LOCALTOP}/web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"