diff --git a/en/Makefile b/en/Makefile
index 78066d5b69..097a40672f 100644
--- a/en/Makefile
+++ b/en/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/Makefile,v 1.75 2001/11/14 18:31:14 phantom Exp $
+# $FreeBSD: www/en/Makefile,v 1.76 2001/12/12 11:57:36 phantom Exp $
 .if exists(Makefile.conf)
 .include "Makefile.conf"
 .endif
@@ -85,7 +85,9 @@ 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} index.html
+.endif
 
 # Handle the FAQ/ and handbook/ directories specially.
 FAQ:
diff --git a/en/gallery/Makefile b/en/gallery/Makefile
index 60036dc450..4daa43d2bf 100644
--- a/en/gallery/Makefile
+++ b/en/gallery/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/gallery/Makefile,v 1.14 2001/10/29 10:14:31 murray Exp $
+# $FreeBSD: www/en/gallery/Makefile,v 1.15 2001/12/12 11:57:36 phantom Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -19,21 +19,29 @@ CLEANFILES+= ${DATA}
 
 gallery.html: gallery.xml gallery.xsl ../includes.xsl
 	${XSLT} ${.CURDIR}/gallery.xsl ${.CURDIR}/gallery.xml > ${.TARGET}
+.if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
 
 cgallery.html: gallery.xml gallery-entry.xsl
 	${XSLT} --param type \'commercial\' \
 		${.CURDIR}/gallery-entry.xsl ${.CURDIR}/gallery.xml > ${.TARGET}
+.if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
 
 npgallery.html: gallery.xml gallery-entry.xsl
 	${XSLT} --param type \'nonprofit\' \
 		${.CURDIR}/gallery-entry.xsl ${.CURDIR}/gallery.xml > ${.TARGET}
+.if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
 
 pgallery.html: gallery.xml gallery-entry.xsl
 	${XSLT} --param type \'personal\' \
 		${.CURDIR}/gallery-entry.xsl ${.CURDIR}/gallery.xml > ${.TARGET}
+.if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/news/Makefile b/en/news/Makefile
index 3abb95c27c..cb2b4d928d 100644
--- a/en/news/Makefile
+++ b/en/news/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/news/Makefile,v 1.30 2001/10/29 10:14:31 murray Exp $
+# $FreeBSD: www/en/news/Makefile,v 1.31 2001/12/12 11:57:37 phantom Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -37,7 +37,9 @@ CLEANFILES+=	newsflash.html news.rdf press.html
 newsflash.html: newsflash.xsl news.xml includes.xsl ../includes.xsl
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
 		${.CURDIR}/newsflash.xsl ${.CURDIR}/news.xml
+.if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
 
 news.rdf: news-rdf.xsl news.xml includes.xsl ../includes.xsl
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
@@ -46,6 +48,8 @@ news.rdf: news-rdf.xsl news.xml includes.xsl ../includes.xsl
 press.html: press.xsl press.xml includes.xsl ../includes.xsl
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
 		${.CURDIR}/press.xsl ${.CURDIR}/press.xml
+.if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/news/status/Makefile b/en/news/status/Makefile
index 5facacfbaf..6ae06258ae 100644
--- a/en/news/status/Makefile
+++ b/en/news/status/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/news/status/Makefile,v 1.10 2001/11/12 22:25:12 chris Exp $
+# $FreeBSD: www/en/news/status/Makefile,v 1.11 2001/12/12 11:57:37 phantom Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -24,7 +24,9 @@ CLEANFILES+=	${DATA:M*.html}
 .xml.html:	report.xsl includes.xsl
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
 		${.CURDIR}/report.xsl ${.IMPSRC}
+.if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
 
 INDEXLINK=	status.html
 
diff --git a/ja/Makefile b/ja/Makefile
index e60158607f..d07a178ed7 100644
--- a/ja/Makefile
+++ b/ja/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/ja/Makefile,v 1.53 2001/11/17 17:21:09 hrs Exp $
+# $FreeBSD: www/ja/Makefile,v 1.54 2001/12/12 11:57:38 phantom Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.75
 
@@ -83,7 +83,9 @@ 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
-	-${TIDY} ${TIDYOPTS} index.html
+.if !defined(NO_TIDY)
+	-${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
 
 ### Revision checking
 REVCHECK=	yes
diff --git a/ja/gallery/Makefile b/ja/gallery/Makefile
index 8f3085b2aa..5115821e32 100644
--- a/ja/gallery/Makefile
+++ b/ja/gallery/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/ja/gallery/Makefile,v 1.16 2001/11/18 22:33:58 hrs Exp $
+# $FreeBSD: www/ja/gallery/Makefile,v 1.17 2001/12/12 11:57:38 phantom Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.14
 
@@ -23,22 +23,30 @@ CLEANFILES+= ${DATA}
 
 gallery.html: ${SRC} gallery.xsl ../includes.xsl
 	${XSLT} ${.CURDIR}/gallery.xsl ${.CURDIR}/${SRC} > ${.TARGET}
+.if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
 
 cgallery.html: ${SRC} gallery-entry.xsl
 	${XSLT} --param type \'commercial\' \
 		${.CURDIR}/gallery-entry.xsl ${.CURDIR}/${SRC} > ${.TARGET}
+.if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
 
 npgallery.html: ${SRC} gallery-entry.xsl
 	${XSLT} --param type \'nonprofit\' \
 		${.CURDIR}/gallery-entry.xsl ${.CURDIR}/${SRC} > ${.TARGET}
+.if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
 
 pgallery.html: ${SRC} gallery-entry.xsl
 	${XSLT} --param type \'personal\' \
 		${.CURDIR}/gallery-entry.xsl ${.CURDIR}/${SRC} > ${.TARGET}
+.if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
 
 ### Revision checking
 REVCHECK=	yes
diff --git a/ja/news/Makefile b/ja/news/Makefile
index 2f64546c20..2405bc26e1 100644
--- a/ja/news/Makefile
+++ b/ja/news/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/ja/news/Makefile,v 1.30 2001/11/19 15:35:42 hrs Exp $
+# $FreeBSD: www/ja/news/Makefile,v 1.31 2001/12/12 11:57:42 phantom Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.30
 
@@ -40,7 +40,9 @@ CLEANFILES+=	newsflash.html press.html
 newsflash.html: newsflash.xsl news.xml includes.xsl ../includes.xsl
 	${XSLTPROC} ${XSLTPROCFLAGS} -o ${.TARGET} \
 		${.CURDIR}/newsflash.xsl ${.CURDIR}/news.xml
+.if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
 
 news.rdf: news-rdf.xsl news.xml includes.xsl ../includes.xsl
 	${XSLTPROC} ${XSLTPROCFLAGS} -o ${.TARGET} \
@@ -49,7 +51,9 @@ news.rdf: news-rdf.xsl news.xml includes.xsl ../includes.xsl
 press.html: press.xsl press.xml includes.xsl ../includes.xsl
 	${XSLTPROC} ${XSLTPROCFLAGS} -o ${.TARGET} \
 		${.CURDIR}/press.xsl ${.CURDIR}/press.xml
+.if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
 
 ### Revision checking
 REVCHECK=	YES