diff --git a/es/Makefile b/es/Makefile
index 1302402182..4b83ec50e3 100644
--- a/es/Makefile
+++ b/es/Makefile
@@ -1,74 +1,65 @@
-# $FreeBSD: www/es/Makefile,v 1.11 2001/06/30 20:31:48 jesusr Exp $
+# $FreeBSD: www/es/Makefile,v 1.12 2001/12/12 11:57:37 phantom 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 
 
 CLEANFILES+=atoz.sgml site.sgml
 
 # These will be directly installed.
 
 #DATA=	COPYING COPYING.LIB README.mirror robots.txt index.html
 DATA=	robots.txt index.html
 
 # Subdirectories
 # SGML
 SUBDIR=	 security
 #SUBDIR+= commercial
 SUBDIR+= docproj
 SUBDIR+= news
 SUBDIR+= alpha
 SUBDIR+= internal
 SUBDIR+= copyright
 SUBDIR+= search
 #SUBDIR+= gallery
 SUBDIR+= projects
 SUBDIR+= releases 
 #SUBDIR+= doc-es
+
 .if !defined(WEB_ONLY) || empty(WEB_ONLY)
 SUBDIR+= ports
+SUBDIR+= doc
 .endif
 
 # Non-SGML
 #SUBDIR+= gifs
 #SUBDIR+= cgi
 
-# Non-English
-#.if !defined(ENGLISH_ONLY) || empty(ENGLISH_ONLY)
-#SUBDIR+= ja
-#SUBDIR+= es
-#.endif
-
-.if !defined(WEB_ONLY) || empty(WEB_ONLY)
-# Extern
-#SUBDIR+= tutorials
-
 #DOCSUBDIR=	FAQ handbook
-DOCSUBDIR=	FAQ
-.endif
+
 SGMLFLAGS+=	-links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr
 
 WEBDIR=		data/es
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/es/doc/Makefile b/es/doc/Makefile
new file mode 100644
index 0000000000..15f6a65ca7
--- /dev/null
+++ b/es/doc/Makefile
@@ -0,0 +1,40 @@
+#
+# $FreeBSD$
+#
+# 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/es_ES.ISO8859-1; \
+                ${MAKE} FORMATS="html-split html" \
+                        INSTALL_COMPRESSED= all
+all-install:
+        @unset DESTDIR || true; \
+         cd ${.CURDIR}/../../../doc/es_ES.ISO8859-1; \
+                ${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \
+                        INSTALL_COMPRESSED= install
+install clean:
+        @unset DESTDIR || true; \
+         cd ${.CURDIR}/../../../doc/es_ES.ISO8859-1; \
+                ${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \
+                        INSTALL_COMPRESSED= ${.TARGET}
+.if make(clean)
+        ${RM} -rf es*
+.endif
+
+.include "${.CURDIR}/../../share/mk/web.site.mk"
+
+obj: _OBJUSE
+
+_OBJUSE: .USE
+        @unset DESTDIR || true; \
+         cd ${.CURDIR}/../../../doc/es_ES.ISO8859-1; \
+                ${MAKE} ${.TARGET}
diff --git a/es/handbook/Makefile b/es/handbook/Makefile
new file mode 100644
index 0000000000..d417078f02
--- /dev/null
+++ b/es/handbook/Makefile
@@ -0,0 +1,25 @@
+#
+# $FreeBSD$
+#
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
+# At build time, we have to link to the doc/ directory at the same level
+# as the www/ tree.
+all:
+        ${LN} -fs ${.OBJDIR}/../../../doc/es_ES.ISO8859-1/books/handbook/* .
+
+# At install time the ../doc/ directory has been populated, so we can
+# link in to there instead.
+install:
+        [ -d ${DOCINSTALLDIR} ] || ${MKDIR} ${DOCINSTALLDIR}
+        cd ${DOCINSTALLDIR}; \
+                ${LN} -fs ../doc/es_ES.ISO8859-1/books/handbook/* \
+                          ${DOCINSTALLDIR}
+
+.include "${WEB_PREFIX}/share/mk/web.site.mk"