diff --git a/en/Makefile b/en/Makefile
index c4d209c1dd..2597304b14 100644
--- a/en/Makefile
+++ b/en/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/Makefile,v 1.106 2004/01/12 21:26:59 hrs Exp $
+# $FreeBSD: www/en/Makefile,v 1.107 2004/02/01 00:02:58 josef Exp $
 .if exists(Makefile.conf)
 .include "Makefile.conf"
 .endif
@@ -91,16 +91,6 @@ WEBDIR?=	data
 DATA+=		index.html
 CLEANFILES+=	index.html
 
-WEBCHECK?=	${PREFIX}/bin/webcheck
-WEBCHECKOPTS?=	-ab ${WEBCHECKFLAGS}
-WEBCHECKDIR?=	/webcheck
-WEBCHECKINSTALLDIR?= ${DESTDIR}${WEBCHECKDIR}
-WEBCHECKURL?=	http://www.FreeBSD.org/
-
-webcheck:
-	@[ -d ${WEBCHECKINSTALLDIR} ] || ${MKDIR} ${WEBCHECKINSTALLDIR}
-	${WEBCHECK} ${WEBCHECKOPTS} -o ${WEBCHECKINSTALLDIR} ${WEBCHECKURL}
-
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
 
 index.html: index.xsl ${XML_INCLUDES}\
diff --git a/share/mk/web.site.mk b/share/mk/web.site.mk
index 3ba8979590..10bf9f01b8 100644
--- a/share/mk/web.site.mk
+++ b/share/mk/web.site.mk
@@ -63,6 +63,12 @@ HTML2TXTOPTS?=	-dump ${HTML2TXTFLAGS}
 ISPELL?=	ispell
 ISPELLOPTS?=	-l -p /usr/share/dict/freebsd ${ISPELLFLAGS}
 
+WEBCHECK?=	${PREFIX}/bin/webcheck
+WEBCHECKOPTS?=	-ab ${WEBCHECKFLAGS}
+WEBCHECKDIR?=	/webcheck
+WEBCHECKINSTALLDIR?= ${DESTDIR}${WEBCHECKDIR} 
+WEBCHECKURL?=	http://www.FreeBSD.org/${WEBBASE:S/data//}/${WEBDIR:S/data//}/
+
 #
 # Install dirs derived from the above.
 #
@@ -192,6 +198,17 @@ spellcheck:
 	@${HTML2TXT} ${HTML2TXTOPTS} ${.CURDIR}/${_entry} | ${ISPELL} ${ISPELLOPTS}
 .endfor
 
+#
+# Check installed page's hypertext references.  Checking is done relatively
+# to ${.CURDIR} value, i.e. calling 'make webcheck' in www/ru/java
+# directory will force checking all URLs at http://www.FreeBSD.org/ru/java/
+#
+# NOTE: webcheck's output always stored to ${DESTDIR}/webcheck directory.
+#
+webcheck:
+	@[ -d ${WEBCHECKINSTALLDIR} ] || ${MKDIR} ${WEBCHECKINSTALLDIR}
+	${WEBCHECK} ${WEBCHECKOPTS} -o ${WEBCHECKINSTALLDIR} ${WEBCHECKURL}
+
 ##################################################################
 # Main Targets