diff --git a/ja/Makefile b/ja/Makefile
index d07a178ed7..28eec2bbf0 100644
--- a/ja/Makefile
+++ b/ja/Makefile
@@ -1,93 +1,93 @@
-# $FreeBSD: www/ja/Makefile,v 1.54 2001/12/12 11:57:38 phantom Exp $
+# $FreeBSD: www/ja/Makefile,v 1.55 2001/12/13 19:30:09 phantom Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.75
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
 # These are turned into validated, normalized HTML files.
 
 DOCS=  applications.sgml
 DOCS+= auditors.sgml
 DOCS+= availability.sgml
 DOCS+= docs.sgml 
 DOCS+= features.sgml
 DOCS+= register.sgml
 DOCS+= internet.sgml 
 DOCS+= mailto.sgml 
 DOCS+= publish.sgml
 #DOCS+= relnotes.sgml
 DOCS+= send-pr.sgml
 DOCS+= support.sgml
 DOCS+= where.sgml 
 DOCS+= y2kbug.sgml 
 
 # Japanese-only file
 DOCS+= jabout.sgml
 
 # These will be directly installed.
 
 #DATA=	favicon.ico
 #DATA+=	robots.txt
 
 # Subdirectories
 # SGML
 SUBDIR=	 security
 SUBDIR+= commercial
 SUBDIR+= docproj
 SUBDIR+= news
 
 SUBDIR+= internal
 SUBDIR+= java
 SUBDIR+= copyright
 SUBDIR+= search
 SUBDIR+= gallery
 SUBDIR+= projects
 #SUBDIR+= prstats
 SUBDIR+= platforms
 SUBDIR+= releases
 SUBDIR+= smp
 SUBDIR+= conspectus
 .if !defined(WEB_ONLY) || empty(WEB_ONLY)
 SUBDIR+= ports
-# SUBDIR+= doc
+SUBDIR+= doc
 # .endif
 # .if defined(BUILD_RELNOTES)
 # SUBDIR+= relnotes
 # .endif
 #
 # # These *must* be listed after the "doc" subdir, as they create symlinks
 # # in to it.
 # .if !defined(WEB_ONLY) || empty(WEB_ONLY)
 SUBDIR+= tutorials
 
 DOCSUBDIR=	FAQ handbook
 .endif
 
 # Non-SGML
 #SUBDIR+= gifs
 #SUBDIR+= cgi
 
 SGMLFLAGS=	-links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr -e EUC-JP
 
 WEBDIR=		data/ja
 
 # index.html is special, and generated from index.xsl and news/news.xml
 DATA+=		index.html
 CLEANFILES+=	index.html
 
 index.html: index.xsl news/news.xml news/press.xml includes.xsl news/includes.xsl
 	${XSLTPROC} ${XSLTPROCOPTS} -o index.html \
 		${.CURDIR}/index.xsl ${.CURDIR}/news/news.xml
 .if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
 .endif
 
 ### Revision checking
 REVCHECK=	yes
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/doc/Makefile b/ja/doc/Makefile
new file mode 100644
index 0000000000..ee8e56631e
--- /dev/null
+++ b/ja/doc/Makefile
@@ -0,0 +1,42 @@
+#
+# $FreeBSD$
+# Original revision: 1.8
+#
+# Build the FreeBSD documentation *outside* of the www tree, and install it
+# in to the right place as necessary.
+#
+# This assumes that you have the www/ and doc/ trees checked out beside
+# one another -- this was always the case anyway, so there are no extra
+# requirements here.
+#
+
+all: all-all all-install
+
+all-all:
+	@unset DESTDIR || true; \
+	 cd ${.CURDIR}/../../../doc/ja_JP.eucJP; \
+		${MAKE} FORMATS="html-split html" \
+			INSTALL_COMPRESSED= NO_JPMAN= all
+all-install:
+	@unset DESTDIR || true; \
+	 cd ${.CURDIR}/../../../doc/ja_JP.eucJP; \
+		${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \
+			INSTALL_COMPRESSED= NO_JPMAN= install
+
+install clean:
+	@unset DESTDIR || true; \
+	 cd ${.CURDIR}/../../../doc/ja_JP.eucJP; \
+		${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \
+			INSTALL_COMPRESSED= NO_JPMAN= ${.TARGET}
+.if make(clean)
+	${RM} -rf ja*
+.endif
+
+.include "${.CURDIR}/../../share/mk/web.site.mk"
+
+obj: _OBJUSE
+
+_OBJUSE: .USE
+	@unset DESTDIR || true; \
+	 cd ${.CURDIR}/../../../doc/ja_JP.eucJP; \
+		${MAKE} ${.TARGET}