diff --git a/en/Makefile b/en/Makefile
index 31da9ae988..e9cd508228 100644
--- a/en/Makefile
+++ b/en/Makefile
@@ -1,76 +1,88 @@
-# $FreeBSD: www/en/Makefile,v 1.61 2001/02/25 12:00:49 alex Exp $
+# $FreeBSD: www/en/Makefile,v 1.62 2001/04/17 09:05:42 nik Exp $
 .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+= index.sgml
 DOCS+= internet.sgml 
 DOCS+= mailto.sgml 
 DOCS+= publish.sgml
 DOCS+= send-pr.sgml
 DOCS+= support.sgml
 DOCS+= where.sgml 
 DOCS+= y2kbug.sgml 
 
 # These will be directly installed.
 
 DATA=	robots.txt
 
 # Subdirectories
 # SGML
 SUBDIR=	 security
 SUBDIR+= commercial
 SUBDIR+= doc
 SUBDIR+= docproj
 SUBDIR+= news
 SUBDIR+= alpha
 SUBDIR+= internal
 SUBDIR+= java
 SUBDIR+= copyright
 SUBDIR+= search
 SUBDIR+= gallery
 SUBDIR+= projects
 SUBDIR+= platforms
 SUBDIR+= releases 
 SUBDIR+= smp
 SUBDIR+= conspectus
 .if !defined(WEB_ONLY) || empty(WEB_ONLY)
 SUBDIR+= ports
 .endif
 
 # These *must* be listed after the "doc" subdir, as they create symlinks
 # in to it.
-SUBDIR+= FAQ 
-SUBDIR+= handbook
 SUBDIR+= tutorials
 
 # Non-SGML
 SUBDIR+= gifs
 SUBDIR+= cgi
 
 WEB_LANG?=	ja es ru zh de
 
+COOKIE=	FAQ handbook
+
 # Non-English
 
 .if !defined(ENGLISH_ONLY) || empty(ENGLISH_ONLY)
 .for DIR in ${WEB_LANG}
 #SUBDIR+=	../${DIR}
 .endfor
 .endif
 
 SGMLOPTS+=      -links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr
 
 WEBDIR=		data
 
+# Handle the FAQ/ and handbook/ directories specially.
+
+FAQ:
+	ln -fs ${.CURDIR}/../../doc/en_US.ISO_8859-1/books/faq FAQ
+
+handbook:
+	ln -fs ${.CURDIR}/../../doc/en_US.ISO_8859-1/books/handbook handbook
+
+afterinstall:
+	ln -fs ${.CURDIR}/doc/en_US.ISO_8859-1/books/faq ${DOCINSTALLDIR}/FAQ
+	ln -fs ${.CURDIR}/doc/en_US.ISO_8859-1/books/handbook ${DOCINSTALLDIR}/handbook
+
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/doc/Makefile b/en/doc/Makefile
index 6c43caf2f1..4c9c5acb82 100644
--- a/en/doc/Makefile
+++ b/en/doc/Makefile
@@ -1,13 +1,20 @@
 #
-# $FreeBSD: www/en/docs/Makefile,v 1.3 2001/02/24 18:04:10 nik Exp $i
+# $FreeBSD: www/en/doc/Makefile,v 1.1 2001/04/17 09:05:43 nik Exp $i
 #
 # 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 install clean:
+all:
+	(unset DESTDIR || true; cd ${.CURDIR}/../../../doc/en_US.ISO_8859-1 && ${MAKE} FORMATS=html-split all)
+	(unset DESTDIR || true; cd ${.CURDIR}/../../../doc/en_US.ISO_8859-1 && ${MAKE} FORMATS=html-split DOCDIR=${.CURDIR} install)
+	
+install clean:
 	(unset DESTDIR || true; cd ${.CURDIR}/../../../doc/en_US.ISO_8859-1 && ${MAKE} FORMATS=html-split DOCDIR=${DESTDIR}/data/doc ${.TARGET})
+.if make(clean)
+	rm -rf en* handbook faq
+.endif