diff --git a/Makefile.inc b/Makefile.inc
new file mode 100644
index 0000000000..736fc37edf
--- /dev/null
+++ b/Makefile.inc
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+WEB_PREFIX?=	${.CURDIR}/..
diff --git a/en/Makefile.inc b/en/Makefile.inc
index 1c72a3f6af..6269c9b42e 100644
--- a/en/Makefile.inc
+++ b/en/Makefile.inc
@@ -1,3 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: www/en/Makefile.inc,v 1.7 1999/09/06 07:02:36 peter Exp $
 
 WEBBASE?=	/data
+WEB_PREFIX?=	${.CURDIR}/../..
diff --git a/en/alpha/Makefile b/en/alpha/Makefile
index 3861e49ce6..b5c3a419c4 100644
--- a/en/alpha/Makefile
+++ b/en/alpha/Makefile
@@ -1,11 +1,14 @@
-# $FreeBSD$
- 
+# $FreeBSD: www/en/alpha/Makefile,v 1.6 1999/09/06 07:02:39 peter Exp $
+
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=   alpha.sgml
- 
+
 INDEXLINK=alpha.html
- 
-.include "../web.mk"
+
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/cgi/Makefile b/en/cgi/Makefile
index a7a669af0f..e74ce6d6b2 100644
--- a/en/cgi/Makefile
+++ b/en/cgi/Makefile
@@ -1,8 +1,11 @@
-# $FreeBSD: www/en/cgi/Makefile,v 1.15 1999/09/06 07:02:39 peter Exp $
+# $FreeBSD: www/en/cgi/Makefile,v 1.16 2000/08/14 04:57:27 knu Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DATA=	ftp.mirrors
 DATA+=	cvsweb.conf cvsweb.conf-freebsd cvsweb.conf-netbsd cvsweb.conf-openbsd
@@ -17,5 +20,4 @@ CGI+=	mailindex.cgi
 .C.cgi:
 	${CXX} ${CFLAGS} -o ${.TARGET} ${.IMPSRC}
 
-.include "../web.mk"
-
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/commercial/Makefile b/en/commercial/Makefile
index 4c599ac8cf..4512ab2166 100644
--- a/en/commercial/Makefile
+++ b/en/commercial/Makefile
@@ -1,8 +1,11 @@
-# $FreeBSD: www/en/commercial/Makefile,v 1.12 2000/04/04 09:21:21 kuriyama Exp $
+# $FreeBSD: www/en/commercial/Makefile,v 1.13 2000/09/30 00:21:38 nbm Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 PERL=	perl5
 
@@ -48,4 +51,4 @@ software.inc: gencommercial.pl commercial.desc software.raw
 software_bycat.inc: gencommercial.pl commercial.desc software.raw
 	${PERL} ${.CURDIR}/gencommercial.pl -s ${.CURDIR} -c software
 
-.include <../web.mk>
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/conspectus/Makefile b/en/conspectus/Makefile
index 5faeabefce..57394ef8ca 100644
--- a/en/conspectus/Makefile
+++ b/en/conspectus/Makefile
@@ -1,11 +1,14 @@
-# $FreeBSD: www/en/docproj/Makefile,v 1.7 1999/09/06 07:02:43 peter Exp $
+# $FreeBSD: www/en/conspectus/Makefile,v 1.1 2000/05/31 20:35:46 nik Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=   index.sgml 
 
 SUBDIR=	stable
 
-.include "../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/conspectus/Makefile.inc b/en/conspectus/Makefile.inc
index d3f040ec3c..42ad0212a4 100644
--- a/en/conspectus/Makefile.inc
+++ b/en/conspectus/Makefile.inc
@@ -1,3 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: www/en/conspectus/Makefile.inc,v 1.1 2000/06/10 00:31:52 nik Exp $
 
 WEBBASE?=	/data/conspectus
+WEB_PREFIX?=	${.CURDIR}/../../..
diff --git a/en/conspectus/stable/2000/05/Makefile b/en/conspectus/stable/2000/05/Makefile
index d49ab14e4c..99b6b3405f 100644
--- a/en/conspectus/stable/2000/05/Makefile
+++ b/en/conspectus/stable/2000/05/Makefile
@@ -1,9 +1,12 @@
-# $FreeBSD: www/en/docproj/Makefile,v 1.7 1999/09/06 07:02:43 peter Exp $
+# $FreeBSD: www/en/conspectus/stable/2000/05/Makefile,v 1.1 2000/05/31 20:35:47 nik Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=	29.sgml
 
-.include "../../../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/conspectus/stable/2000/06/Makefile b/en/conspectus/stable/2000/06/Makefile
index 6806779d3a..2ec1bcf531 100644
--- a/en/conspectus/stable/2000/06/Makefile
+++ b/en/conspectus/stable/2000/06/Makefile
@@ -1,10 +1,13 @@
-# $FreeBSD: www/en/conspectus/stable/2000/06/Makefile,v 1.1 2000/06/17 13:13:11 nik Exp $
+# $FreeBSD: www/en/conspectus/stable/2000/06/Makefile,v 1.2 2000/07/03 23:49:29 nik Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=	05.sgml
 DOCS+=	12.sgml
 
-.include "../../../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/conspectus/stable/2000/Makefile b/en/conspectus/stable/2000/Makefile
index 847006cefd..b91583c815 100644
--- a/en/conspectus/stable/2000/Makefile
+++ b/en/conspectus/stable/2000/Makefile
@@ -1,12 +1,15 @@
-# $FreeBSD: www/en/conspectus/stable/2000/Makefile,v 1.1 2000/05/31 20:35:47 nik Exp $
+# $FreeBSD: www/en/conspectus/stable/2000/Makefile,v 1.2 2000/06/17 13:15:37 nik Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=	index.sgml
 
 SUBDIR=	05
 SUBDIR+= 06
 
-.include "../../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/conspectus/stable/2000/Makefile.inc b/en/conspectus/stable/2000/Makefile.inc
index eb7f1056c3..62fdd77644 100644
--- a/en/conspectus/stable/2000/Makefile.inc
+++ b/en/conspectus/stable/2000/Makefile.inc
@@ -1,3 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: www/en/conspectus/stable/2000/Makefile.inc,v 1.1 2000/06/10 00:31:53 nik Exp $
 
 WEBBASE?=	/data/conspectus/stable/2000
+WEB_PREFIX?=	${.CURDIR}/../../../../..
diff --git a/en/conspectus/stable/Makefile b/en/conspectus/stable/Makefile
index ded802e55f..102a60e014 100644
--- a/en/conspectus/stable/Makefile
+++ b/en/conspectus/stable/Makefile
@@ -1,9 +1,12 @@
-# $FreeBSD: www/en/docproj/Makefile,v 1.7 1999/09/06 07:02:43 peter Exp $
+# $FreeBSD: www/en/conspectus/stable/Makefile,v 1.1 2000/05/31 20:35:47 nik Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 SUBDIR=	2000
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/conspectus/stable/Makefile.inc b/en/conspectus/stable/Makefile.inc
index 1a18c5fa93..5a212750cc 100644
--- a/en/conspectus/stable/Makefile.inc
+++ b/en/conspectus/stable/Makefile.inc
@@ -1,3 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: www/en/conspectus/stable/Makefile.inc,v 1.1 2000/06/10 00:31:53 nik Exp $
 
 WEBBASE?=	/data/conspectus/stable
+WEB_PREFIX?=	${.CURDIR}/../../../..
diff --git a/en/copyright/Makefile b/en/copyright/Makefile
index da8a5a443e..15b231d0eb 100644
--- a/en/copyright/Makefile
+++ b/en/copyright/Makefile
@@ -1,8 +1,11 @@
-# $FreeBSD: www/en/copyright/Makefile,v 1.8 1999/09/06 07:02:42 peter Exp $
+# $FreeBSD: www/en/copyright/Makefile,v 1.9 1999/09/19 11:10:34 wosch Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=	license.sgml
 DOCS+=	freebsd-license.sgml
@@ -32,4 +35,4 @@ ${LEGAL}: $${CVSROOT}/${LEGAL_FILE},v
 	cvs ${CVS_OPT} co -p ${LEGAL_FILE} > ${.TARGET}
 .endif
 
-.include "../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/docproj/Makefile b/en/docproj/Makefile
index 94b946e148..48e9c18d74 100644
--- a/en/docproj/Makefile
+++ b/en/docproj/Makefile
@@ -1,8 +1,11 @@
-# $FreeBSD$
+# $FreeBSD: www/en/docproj/Makefile,v 1.7 1999/09/06 07:02:43 peter Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=   current.sgml 
 DOCS+=	doc-set.sgml
@@ -14,4 +17,4 @@ DOCS+=	docproj.sgml
 
 INDEXLINK= docproj.html
 
-.include "../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/gallery/Makefile b/en/gallery/Makefile
index b79713d0e4..86987aed99 100644
--- a/en/gallery/Makefile
+++ b/en/gallery/Makefile
@@ -1,8 +1,11 @@
-# $FreeBSD: www/en/gallery/Makefile,v 1.9 2000/04/20 16:40:58 phantom Exp $
+# $FreeBSD: www/en/gallery/Makefile,v 1.10 2000/09/30 00:21:39 nbm Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS = gallery.sgml
 DOCS+= cgallery.sgml
@@ -32,5 +35,4 @@ gallery.inc: gallery.db gallery.sgml
 	          print qq/<!ENTITY num./.lc($$1).qq/ CDATA "$$2">\n/' \
 	> gallery.inc
 
-.include "../web.mk"
-
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/gifs/Makefile b/en/gifs/Makefile
index 98d6383253..909fdde155 100644
--- a/en/gifs/Makefile
+++ b/en/gifs/Makefile
@@ -1,8 +1,11 @@
-# $FreeBSD: www/en/gifs/Makefile,v 1.30 1999/10/20 19:49:15 motoyuki Exp $
+# $FreeBSD: www/en/gifs/Makefile,v 1.31 2000/10/26 12:29:41 cjh Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DATA=   apache.gif apachepower.gif daemon.gif dir.gif doc.gif
 DATA+=  home.gif littlelogo.gif new.gif power-button.gif
@@ -43,4 +46,4 @@ DATA+=	darbylogo.gif
 DATA+=	bsdmagazine.jpg
 DATA+=	aboutf.jpg aboutfb.jpg
 
-.include "../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/internal/Makefile b/en/internal/Makefile
index b5869e2874..703480668c 100644
--- a/en/internal/Makefile
+++ b/en/internal/Makefile
@@ -1,8 +1,11 @@
-# $FreeBSD: www/en/internal/Makefile,v 1.21 2000/03/12 21:44:02 phantom Exp $
+# $FreeBSD: www/en/internal/Makefile,v 1.22 2000/04/20 16:40:11 phantom Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=	photos.sgml	
 DOCS+=	internal.sgml	
@@ -30,4 +33,4 @@ CLEANFILES+=	homepage.inc
 
 DATA+=	README.mirror
 
-.include "../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/java/Makefile b/en/java/Makefile
index 642944b591..b17c41fb51 100644
--- a/en/java/Makefile
+++ b/en/java/Makefile
@@ -1,8 +1,11 @@
-# $FreeBSD: www/en/java/Makefile,v 1.1 2000/01/29 14:16:53 wosch Exp $
+# $FreeBSD: www/en/java/Makefile,v 1.2 2000/03/02 15:55:14 phantom Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 SUBDIR =	dists
 SUBDIR+=	docs
@@ -17,4 +20,4 @@ DOCS+=  press.sgml
 
 DATA=	j2j.gif
 
-.include "../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/java/Makefile.inc b/en/java/Makefile.inc
index 5474089263..d2c24e5d31 100644
--- a/en/java/Makefile.inc
+++ b/en/java/Makefile.inc
@@ -1,3 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: www/en/java/Makefile.inc,v 1.1 2000/03/02 15:55:14 phantom Exp $
 
-WEBBASE?= /data/java
+WEBBASE?=	/data/java
+WEB_PREFIX?=	${.CURDIR}/../../..
diff --git a/en/java/dists/Makefile b/en/java/dists/Makefile
index 840234919f..42591175ec 100644
--- a/en/java/dists/Makefile
+++ b/en/java/dists/Makefile
@@ -1,4 +1,11 @@
-# $FreeBSD$
+# $FreeBSD: www/en/java/dists/Makefile,v 1.3 2000/03/02 15:55:29 phantom Exp $
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS =	10.sgml
 DOCS+=	11.sgml
@@ -6,4 +13,4 @@ DOCS+=	12.sgml
 DOCS+=	13.sgml
 DOCS+=	index.sgml
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/java/docs/Makefile b/en/java/docs/Makefile
index c6ec971f91..4639d6976f 100644
--- a/en/java/docs/Makefile
+++ b/en/java/docs/Makefile
@@ -1,4 +1,11 @@
-# $FreeBSD: www/en/java/docs/Makefile,v 1.2 2000/03/02 15:55:52 phantom Exp $
+# $FreeBSD: www/en/java/docs/Makefile,v 1.3 2000/05/03 14:14:27 patrick Exp $
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS =	faq.sgml
 DOCS+=	howtoports.sgml
@@ -6,4 +13,4 @@ DOCS+=	newbies.sgml
 DOCS+=	tutorials.sgml
 DOCS+=	performance.sgml
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/java/links/Makefile b/en/java/links/Makefile
index 53c8e2f854..63009bc999 100644
--- a/en/java/links/Makefile
+++ b/en/java/links/Makefile
@@ -1,4 +1,11 @@
-# $FreeBSD$
+# $FreeBSD: www/en/java/links/Makefile,v 1.2 2000/03/02 15:55:53 phantom Exp $
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS =	freebsd.sgml
 DOCS+=	tools.sgml
@@ -11,4 +18,4 @@ DOCS+=	vendor.sgml
 DOCS+=	documentation.sgml
 DOCS+=	servlets.sgml
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/news/1996/Makefile b/en/news/1996/Makefile
index 23fb079a62..2d006f467a 100644
--- a/en/news/1996/Makefile
+++ b/en/news/1996/Makefile
@@ -1,9 +1,12 @@
-# $FreeBSD: www/en/news/1996/Makefile,v 1.1 2000/03/21 18:45:11 nik Exp $
+# $FreeBSD: www/en/news/1996/Makefile,v 1.2 2000/03/22 16:22:43 phantom Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=	index.sgml
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/news/1997/Makefile b/en/news/1997/Makefile
index 1569253c81..76016177fa 100644
--- a/en/news/1997/Makefile
+++ b/en/news/1997/Makefile
@@ -1,9 +1,13 @@
-# $FreeBSD: www/en/news/1997/Makefile,v 1.1 2000/03/21 18:45:13 nik Exp $
+# $FreeBSD: www/en/news/1997/Makefile,v 1.2 2000/03/22 16:22:49 phantom Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=	index.sgml
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
+
diff --git a/en/news/Makefile b/en/news/Makefile
index acfdd2c921..73fcc486c5 100644
--- a/en/news/Makefile
+++ b/en/news/Makefile
@@ -1,8 +1,11 @@
-# $FreeBSD: www/en/news/Makefile,v 1.21 2000/10/03 09:48:09 wosch Exp $
+# $FreeBSD: www/en/news/Makefile,v 1.22 2000/10/21 16:39:25 phantom Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS+= press.sgml
 DOCS+= newsflash.sgml
@@ -24,4 +27,5 @@ INDEXLINK= news.html
 
 SUBDIR= 	1996
 SUBDIR+= 	1997
-.include "../web.mk"
+
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/news/Makefile.inc b/en/news/Makefile.inc
index 8eb69f3419..9db38b7970 100644
--- a/en/news/Makefile.inc
+++ b/en/news/Makefile.inc
@@ -1,3 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: www/en/news/Makefile.inc,v 1.1 2000/03/22 16:20:52 phantom Exp $
 
-WEBBASE?= /data/news
+WEBBASE?=	/data/news
+WEB_PREFIX?=	${.CURDIR}/../../..
diff --git a/en/ports/Makefile b/en/ports/Makefile
index a9fabe6ec3..9ffa668913 100644
--- a/en/ports/Makefile
+++ b/en/ports/Makefile
@@ -1,8 +1,11 @@
-# $FreeBSD: www/en/ports/Makefile,v 1.28 2000/09/30 00:21:39 nbm Exp $
+# $FreeBSD: www/en/ports/Makefile,v 1.29 2000/10/06 15:49:00 phantom Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 .if exists(Makefile.inc)
 .include "Makefile.inc"
 .endif
@@ -69,4 +72,4 @@ all install clean:
 	(cd ${.CURDIR} && ${MAKE}  ${MAKEFLAGS} -f Makefile.inc0 ${.TARGET})
 
 
-.include "../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/projects/Makefile b/en/projects/Makefile
index 39c334b8e1..c125317448 100644
--- a/en/projects/Makefile
+++ b/en/projects/Makefile
@@ -1,8 +1,11 @@
-# $FreeBSD$
+# $FreeBSD: www/en/projects/Makefile,v 1.6 1999/09/06 07:02:48 peter Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=	projects.sgml
 DOCS+=	mozilla.sgml
@@ -10,4 +13,4 @@ DOCS+=	newbies.sgml
 
 INDEXLINK= projects.html
 
-.include "../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/1.1.5/Makefile b/en/releases/1.1.5/Makefile
index 1340175acd..198998134d 100644
--- a/en/releases/1.1.5/Makefile
+++ b/en/releases/1.1.5/Makefile
@@ -1,6 +1,15 @@
+# $FreeBSD$
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
 DATA=	CONTRIB.386BSD CONTRIB.FreeBSD COPYRIGHT.386BSD
 DATA+=	COPYRIGHT.FreeBSD COPYRIGHT.USL KNOWNBUGS MIRROR.SITES
 DATA+=	PERSONAL.ACKS REGISTER.FreeBSD RELNOTES.FreeBSD ROSTER.FreeBSD
 DATA+=	SUPPORT.TXT TODO-1.1.5
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/1.1/Makefile b/en/releases/1.1/Makefile
index 39794b4e32..1716f1f664 100644
--- a/en/releases/1.1/Makefile
+++ b/en/releases/1.1/Makefile
@@ -1,4 +1,13 @@
+# $FreeBSD$
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
 DATA=	CONTRIB.386BSD CONTRIB.FreeBSD COPYRIGHT.386BSD COPYRIGHT.FreeBSD
 DATA+=	MIRROR.SITES PERSONAL.ACKS RELNOTES.FreeBSD SUPPORT.TXT
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/2.0.5R/Makefile b/en/releases/2.0.5R/Makefile
index 517e40e9d3..eb4dbb3af2 100644
--- a/en/releases/2.0.5R/Makefile
+++ b/en/releases/2.0.5R/Makefile
@@ -1,3 +1,12 @@
+# $FreeBSD$
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
 DOCS=	announce.sgml notes.sgml
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/2.0/Makefile b/en/releases/2.0/Makefile
index 8955b2ea3e..8a5d3feb39 100644
--- a/en/releases/2.0/Makefile
+++ b/en/releases/2.0/Makefile
@@ -1,4 +1,12 @@
+# $FreeBSD$
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
 DOCS=	announce.sgml credits.sgml install.sgml notes.sgml
 
-.include "../../web.mk"
-
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/2.1.5R/Makefile b/en/releases/2.1.5R/Makefile
index 517e40e9d3..eb4dbb3af2 100644
--- a/en/releases/2.1.5R/Makefile
+++ b/en/releases/2.1.5R/Makefile
@@ -1,3 +1,12 @@
+# $FreeBSD$
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
 DOCS=	announce.sgml notes.sgml
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/2.1.6R/Makefile b/en/releases/2.1.6R/Makefile
index e2e211d24f..a4c4cf0f92 100644
--- a/en/releases/2.1.6R/Makefile
+++ b/en/releases/2.1.6R/Makefile
@@ -1,3 +1,12 @@
+# $FreeBSD$
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
 DOCS=	announce.sgml notes.sgml security.sgml
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/2.1.7R/Makefile b/en/releases/2.1.7R/Makefile
index 517e40e9d3..eb4dbb3af2 100644
--- a/en/releases/2.1.7R/Makefile
+++ b/en/releases/2.1.7R/Makefile
@@ -1,3 +1,12 @@
+# $FreeBSD$
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
 DOCS=	announce.sgml notes.sgml
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/2.1R/Makefile b/en/releases/2.1R/Makefile
index 517e40e9d3..eb4dbb3af2 100644
--- a/en/releases/2.1R/Makefile
+++ b/en/releases/2.1R/Makefile
@@ -1,3 +1,12 @@
+# $FreeBSD$
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
 DOCS=	announce.sgml notes.sgml
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/2.2.1R/Makefile b/en/releases/2.2.1R/Makefile
index 066f6801e4..e78e93d791 100644
--- a/en/releases/2.2.1R/Makefile
+++ b/en/releases/2.2.1R/Makefile
@@ -1,3 +1,12 @@
+# $FreeBSD$
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
 DOCS=	notes.sgml
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/2.2.2R/Makefile b/en/releases/2.2.2R/Makefile
index b7057cf521..196a4d0cc8 100644
--- a/en/releases/2.2.2R/Makefile
+++ b/en/releases/2.2.2R/Makefile
@@ -1,3 +1,12 @@
+# $FreeBSD$
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
 DOCS=	notes.sgml errata.sgml
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/2.2.5R/Makefile b/en/releases/2.2.5R/Makefile
index 6aaa9ea536..7a7b42dfce 100644
--- a/en/releases/2.2.5R/Makefile
+++ b/en/releases/2.2.5R/Makefile
@@ -1,3 +1,12 @@
+# $FreeBSD$
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
 DOCS=	announce.sgml notes.sgml errata.sgml
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/2.2.6R/Makefile b/en/releases/2.2.6R/Makefile
index 6aaa9ea536..7a7b42dfce 100644
--- a/en/releases/2.2.6R/Makefile
+++ b/en/releases/2.2.6R/Makefile
@@ -1,3 +1,12 @@
+# $FreeBSD$
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
 DOCS=	announce.sgml notes.sgml errata.sgml
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/2.2.7R/Makefile b/en/releases/2.2.7R/Makefile
index 6aaa9ea536..7a7b42dfce 100644
--- a/en/releases/2.2.7R/Makefile
+++ b/en/releases/2.2.7R/Makefile
@@ -1,3 +1,12 @@
+# $FreeBSD$
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
 DOCS=	announce.sgml notes.sgml errata.sgml
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/2.2.8R/Makefile b/en/releases/2.2.8R/Makefile
index 6aaa9ea536..7a7b42dfce 100644
--- a/en/releases/2.2.8R/Makefile
+++ b/en/releases/2.2.8R/Makefile
@@ -1,3 +1,12 @@
+# $FreeBSD$
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
 DOCS=	announce.sgml notes.sgml errata.sgml
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/2.2R/Makefile b/en/releases/2.2R/Makefile
index 1ff5ac5fb6..f488ebb62f 100644
--- a/en/releases/2.2R/Makefile
+++ b/en/releases/2.2R/Makefile
@@ -1,3 +1,12 @@
+# $FreeBSD$
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
 DOCS=	announce.sgml install-media.sgml notes.sgml
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/3.0R/Makefile b/en/releases/3.0R/Makefile
index 6aaa9ea536..7a7b42dfce 100644
--- a/en/releases/3.0R/Makefile
+++ b/en/releases/3.0R/Makefile
@@ -1,3 +1,12 @@
+# $FreeBSD$
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
 DOCS=	announce.sgml notes.sgml errata.sgml
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/3.1R/Makefile b/en/releases/3.1R/Makefile
index 6aaa9ea536..7a7b42dfce 100644
--- a/en/releases/3.1R/Makefile
+++ b/en/releases/3.1R/Makefile
@@ -1,3 +1,12 @@
+# $FreeBSD$
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
 DOCS=	announce.sgml notes.sgml errata.sgml
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/3.2R/Makefile b/en/releases/3.2R/Makefile
index 6aaa9ea536..7a7b42dfce 100644
--- a/en/releases/3.2R/Makefile
+++ b/en/releases/3.2R/Makefile
@@ -1,3 +1,12 @@
+# $FreeBSD$
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
 DOCS=	announce.sgml notes.sgml errata.sgml
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/3.3R/Makefile b/en/releases/3.3R/Makefile
index 6aaa9ea536..7a7b42dfce 100644
--- a/en/releases/3.3R/Makefile
+++ b/en/releases/3.3R/Makefile
@@ -1,3 +1,12 @@
+# $FreeBSD$
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
 DOCS=	announce.sgml notes.sgml errata.sgml
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/3.4R/Makefile b/en/releases/3.4R/Makefile
index 6aaa9ea536..7a7b42dfce 100644
--- a/en/releases/3.4R/Makefile
+++ b/en/releases/3.4R/Makefile
@@ -1,3 +1,12 @@
+# $FreeBSD$
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
 DOCS=	announce.sgml notes.sgml errata.sgml
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/3.5R/Makefile b/en/releases/3.5R/Makefile
index 6aaa9ea536..7a7b42dfce 100644
--- a/en/releases/3.5R/Makefile
+++ b/en/releases/3.5R/Makefile
@@ -1,3 +1,12 @@
+# $FreeBSD$
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
 DOCS=	announce.sgml notes.sgml errata.sgml
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/4.0R/Makefile b/en/releases/4.0R/Makefile
index 6aaa9ea536..7a7b42dfce 100644
--- a/en/releases/4.0R/Makefile
+++ b/en/releases/4.0R/Makefile
@@ -1,3 +1,12 @@
+# $FreeBSD$
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
 DOCS=	announce.sgml notes.sgml errata.sgml
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/4.1.1R/Makefile b/en/releases/4.1.1R/Makefile
index 6aaa9ea536..7a7b42dfce 100644
--- a/en/releases/4.1.1R/Makefile
+++ b/en/releases/4.1.1R/Makefile
@@ -1,3 +1,12 @@
+# $FreeBSD$
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
 DOCS=	announce.sgml notes.sgml errata.sgml
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/4.1R/Makefile b/en/releases/4.1R/Makefile
index 6aaa9ea536..7a7b42dfce 100644
--- a/en/releases/4.1R/Makefile
+++ b/en/releases/4.1R/Makefile
@@ -1,3 +1,12 @@
+# $FreeBSD$
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
 DOCS=	announce.sgml notes.sgml errata.sgml
 
-.include "../../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/Makefile b/en/releases/Makefile
index 64202ad8e8..c4adf513f7 100644
--- a/en/releases/Makefile
+++ b/en/releases/Makefile
@@ -1,8 +1,11 @@
-# $FreeBSD: www/en/releases/Makefile,v 1.24 2000/07/27 13:07:13 jkh Exp $
+# $FreeBSD: www/en/releases/Makefile,v 1.25 2000/10/02 17:55:04 phantom Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS?=	index.sgml snapshots.sgml
 
@@ -14,4 +17,4 @@ SUBDIR+=	3.3R 3.4R 3.5R 4.0R 4.1R 4.1.1R
 SUBDIR=
 .endif
 
-.include "../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/releases/Makefile.inc b/en/releases/Makefile.inc
index 59703435ed..3f7e9135e3 100644
--- a/en/releases/Makefile.inc
+++ b/en/releases/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: www/en/releases/Makefile.inc,v 1.4 1999/09/06 07:02:49 peter Exp $
 
 WEBBASE?=	/data/releases
-
+WEB_PREFIX?=	${.CURDIR}/../../..
diff --git a/en/search/Makefile b/en/search/Makefile
index c95bed1ae3..2e8903e464 100644
--- a/en/search/Makefile
+++ b/en/search/Makefile
@@ -1,8 +1,11 @@
-# $FreeBSD: www/en/search/Makefile,v 1.6 2000/04/20 16:41:32 phantom Exp $
+# $FreeBSD: www/en/search/Makefile,v 1.7 2000/09/30 00:21:39 nbm Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS+= index-site.sgml
 DOCS+= search.sgml 
@@ -20,5 +23,4 @@ atoz.sgml: web.atoz
 site.sgml: site.map
 	${PERL} ${.CURDIR}/site.pl < ${.ALLSRC} > ${.TARGET}
 
-.include "../web.mk"
-
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/security/Makefile b/en/security/Makefile
index 034ff10abc..e25caf7172 100644
--- a/en/security/Makefile
+++ b/en/security/Makefile
@@ -1,12 +1,16 @@
-# $FreeBSD$
+# $FreeBSD: www/en/security/Makefile,v 1.6 1999/09/06 07:02:58 peter Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=  
 DOCS+=	security.sgml
 
 INDEXLINK= security.html
 
-.include "../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
+
diff --git a/en/smp/Makefile b/en/smp/Makefile
index 48fb122234..569aababa1 100644
--- a/en/smp/Makefile
+++ b/en/smp/Makefile
@@ -1,9 +1,12 @@
-# $FreeBSD: www/en/docproj/Makefile,v 1.7 1999/09/06 07:02:43 peter Exp $
+# $FreeBSD: www/en/smp/Makefile,v 1.1 2000/10/18 19:43:57 nik Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
 
 DOCS=   index.sgml
 
-.include "../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/tutorials/Makefile b/en/tutorials/Makefile
index 0ccb776dbb..24d36197b6 100644
--- a/en/tutorials/Makefile
+++ b/en/tutorials/Makefile
@@ -1,9 +1,16 @@
 #
-# $FreeBSD: www/en/tutorials/Makefile,v 1.8 2000/05/19 00:10:09 nik Exp $
+# $FreeBSD: www/en/tutorials/Makefile,v 1.9 2000/09/30 00:21:39 nbm Exp $
 #
 # Build the FreeBSD tutorials/articles outside of the www tree, and then
 # install them in to the right place.
 
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
 DOCS = index.sgml
 
 DIRS_TO_CLEAN =	../../../doc/en_US.ISO_8859-1/articles \
@@ -17,4 +24,4 @@ all afterinstall: index.html
 	(cd ${.CURDIR}/../../../doc/en_US.ISO_8859-1/books/porters-handbook && ${MAKE} 'FORMATS=html html-split' DESTDIR=${DESTDIR}/data/porters-handbook ${.TARGET:S/afterinstall/install/})
 	(cd ${.CURDIR}/../../../doc/en_US.ISO_8859-1/books/ppp-primer && ${MAKE} 'FORMATS=html html-split' DESTDIR=${DESTDIR}/data/tutorials/ppp ${.TARGET:S/afterinstall/install/})
 
-.include "../web.mk"
+.include "${WEB_PREFIX}/share/mk/web.site.mk"