diff --git a/hu/Makefile b/hu/Makefile
index f098ff297c..c5b7438535 100644
--- a/hu/Makefile
+++ b/hu/Makefile
@@ -1,56 +1,56 @@
-# $FreeBSD: www/hu/Makefile,v 1.2 2007/01/09 17:09:54 keramida Exp $
+# $FreeBSD: www/hu/Makefile,v 1.3 2007/03/26 15:22:53 gabor Exp $
 
 ###################################################
 # The FreeBSD Hungarian Documentation Project     #
 ###################################################
 
 .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=	about.sgml
 DOCS+=	administration.sgml
 DOCS+=	applications.sgml
 DOCS+=	art.sgml
 DOCS+=	community.sgml
 DOCS+=	docs.sgml
 DOCS+=	features.sgml
 DOCS+=	internet.sgml
 DOCS+=	logo.sgml
 DOCS+=	mailto.sgml
 DOCS+=	send-pr.sgml
 DOCS+=	support.sgml
 DOCS+=	where.sgml
 
 # Subdirectories
 # SGML
 SUBDIR+=	advocacy
 SUBDIR+=	community
 SUBDIR+=	copyright
 SUBDIR+=	developers
 SUBDIR+=	docproj
 SUBDIR+=	docs
 SUBDIR+=	platforms
 SUBDIR+=	search
 SUBDIR+=	projects
 SUBDIR+=	support
+.if !defined(WEB_ONLY) || empty(WEB_ONLY)
+SUBDIR+=	doc
+.endif
 
 WEBDIR?=	data/hu
 
 ## index.html is special, and generated from index.xsl and news/news.xml
 DATA+=		index.html
 CLEANFILES+=	index.html
 
 XMLDOCS=	index:xsl:${XML_NEWS_NEWS}:
 DEPENDSET.index=	transtable mirrors news press events \
 			advisories notices
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
-
-# Workaround against the wrong auto-detection of this path
-XML_MIRRORS:=	${XML_MIRRORS:S@hu*@.@}
diff --git a/hu/doc/Makefile b/hu/doc/Makefile
new file mode 100644
index 0000000000..2733e84dbb
--- /dev/null
+++ b/hu/doc/Makefile
@@ -0,0 +1,46 @@
+#
+# $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.
+#
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
+all: all-all all-install
+
+all-all:
+	@unset DESTDIR || true; \
+	 cd ${DOC_PREFIX}/${LANGCODE}; \
+		${MAKE} FORMATS="html-split html" \
+			INSTALL_COMPRESSED= all
+all-install:
+	@unset DESTDIR || true; \
+	 cd ${DOC_PREFIX}/${LANGCODE}; \
+		${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \
+			INSTALL_COMPRESSED= install
+install clean:
+	@unset DESTDIR || true; \
+	 cd ${DOC_PREFIX}/${LANGCODE}; \
+		${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \
+			INSTALL_COMPRESSED= ${.TARGET}
+.if make(clean)
+	${RM} -rf hu*
+.endif
+
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
+
+obj: _OBJUSE
+
+_OBJUSE: .USE
+	@unset DESTDIR || true; \
+	 cd ${DOC_PREFIX}/${LANGCODE}; \
+		${MAKE} ${.TARGET}