diff --git a/data/Makefile.inc b/data/Makefile.inc
index 76793234c0..91784f0591 100644
--- a/data/Makefile.inc
+++ b/data/Makefile.inc
@@ -1 +1,2 @@
 WEBBASE=	/data
+SGMLOPTS+=	-links -white -hdr ${.CURDIR}/../doc.hdr -ftr ${.CURDIR}/../doc.ftr
diff --git a/data/doc.ftr b/data/doc.ftr
index 38b0c7b771..46fb4b5fc7 100644
--- a/data/doc.ftr
+++ b/data/doc.ftr
@@ -1,8 +1,8 @@
-<hr>
-<a href="../"><img src="../gifs/home.gif" alt="FreeBSD Home
-  Page" border="0" align="right"></a>
+<hr noshade>
+<a href="../"><img src="../gifs/home.gif" alt="FreeBSD Home Page"
+border="0" align="right"></a>
 <address>
-  @@UPDATE@@<br>
-  <a href="../mailto.html">www@freebsd.org</a>
+  <a href="../mailto.html">www@freebsd.org</a><br>
+  @@UPDATE@@
 </address>
 
diff --git a/data/doc.hdr b/data/doc.hdr
index e69de29bb2..542828816a 100644
--- a/data/doc.hdr
+++ b/data/doc.hdr
@@ -0,0 +1 @@
+<img src="../gifs/topbar.gif" alt="">
diff --git a/data/tutorials/Makefile.inc b/data/tutorials/Makefile.inc
index 378ca4b280..4ed43fdcbe 100644
--- a/data/tutorials/Makefile.inc
+++ b/data/tutorials/Makefile.inc
@@ -1 +1,2 @@
 WEBBASE?=	/data/tutorials
+SGMLOPTS+=	-white -hdr ${.CURDIR}/../doc.hdr -ftr ${.CURDIR}/../doc.ftr
diff --git a/data/tutorials/ddwg/Makefile b/data/tutorials/ddwg/Makefile
index 5fb92d5a76..20ad6ff27e 100644
--- a/data/tutorials/ddwg/Makefile
+++ b/data/tutorials/ddwg/Makefile
@@ -1,5 +1,4 @@
 DOC=		ddwg
 SRCS=		ddwg.sgml
-SGMLOPTS=	-ssi
 
 .include <bsd.sgml.mk>
diff --git a/data/tutorials/devel/Makefile b/data/tutorials/devel/Makefile
index 1e48dd92a3..6cc882035c 100644
--- a/data/tutorials/devel/Makefile
+++ b/data/tutorials/devel/Makefile
@@ -1,6 +1,5 @@
 DOC=		devel
 SRCS=		devel.sgml
-SGMLOPTS=	-ssi
 
 .include <bsd.sgml.mk>
 
diff --git a/data/tutorials/doc.ftr b/data/tutorials/doc.ftr
index fed9c481ca..046152d534 100644
--- a/data/tutorials/doc.ftr
+++ b/data/tutorials/doc.ftr
@@ -1,8 +1,8 @@
-<hr>
-<a href="../../"><img src="../../gifs/home.gif" alt="FreeBSD Home
-  Page" border="0" align="right"></a>
+<hr noshade>
+<a href="../../"><img src="../../gifs/home.gif" alt="FreeBSD Home Page"
+border="0" align="right"></a>
 <address>
-  @@UPDATE@@<br>
-  <a href="../../mailto.html">www@freebsd.org</a>
+  <a href="../../mailto.html">www@freebsd.org</a><br>
+  @@UPDATE@@
 </address>
 
diff --git a/data/tutorials/doc.hdr b/data/tutorials/doc.hdr
index e69de29bb2..103b844c50 100644
--- a/data/tutorials/doc.hdr
+++ b/data/tutorials/doc.hdr
@@ -0,0 +1 @@
+<img src="../../gifs/topbar.gif" alt="">
diff --git a/data/tutorials/fonts/Makefile b/data/tutorials/fonts/Makefile
index 1778c80e93..4ccd43e7b5 100644
--- a/data/tutorials/fonts/Makefile
+++ b/data/tutorials/fonts/Makefile
@@ -1,6 +1,5 @@
 DOC=		fonts
 SRCS=		fonts.sgml
-SGMLOPTS=	-ssi
 
 .include <bsd.sgml.mk>
 
diff --git a/data/tutorials/mh/Makefile b/data/tutorials/mh/Makefile
index e39a8c273f..656c29a14a 100644
--- a/data/tutorials/mh/Makefile
+++ b/data/tutorials/mh/Makefile
@@ -1,6 +1,5 @@
 DOC=		mh
 SRCS=		mh.sgml
-SGMLOPTS=	-ssi
 
 .include <bsd.sgml.mk>
 
diff --git a/data/tutorials/multios/Makefile b/data/tutorials/multios/Makefile
index f884339423..0e4f4527c3 100644
--- a/data/tutorials/multios/Makefile
+++ b/data/tutorials/multios/Makefile
@@ -1,6 +1,5 @@
 DOC=		multios
 SRCS=		multios.sgml
-SGMLOPTS=	-ssi
 
 .include <bsd.sgml.mk>
 
diff --git a/data/web.mk b/data/web.mk
index b08215176f..68de0d92e0 100644
--- a/data/web.mk
+++ b/data/web.mk
@@ -1,5 +1,5 @@
 # bsd.web.mk
-# $Id: web.mk,v 1.5 1996-10-01 23:41:29 jfieber Exp $
+# $Id: web.mk,v 1.6 1996-10-06 00:08:08 jfieber Exp $
 
 #
 # Build and install a web site.
@@ -239,7 +239,7 @@ _PROGSUBDIR: .USE
 FORMATS?=	"html ps latin1 ascii"
 PARAMS=		DESTDIR=${DESTDIR} DOCDIR=${WEBBASE}/${WEBDIR}
 PARAMS+=	DOCOWN=${WEBOWN} DOCGRP=${WEBGRP}
-PARAMS+=	SGMLOPTS="-links" FORMATS=${FORMATS} COPY="${COPY}"
+PARAMS+=	FORMATS=${FORMATS} COPY="${COPY}"
 
 .endif
 
diff --git a/en/Makefile.inc b/en/Makefile.inc
index 76793234c0..91784f0591 100644
--- a/en/Makefile.inc
+++ b/en/Makefile.inc
@@ -1 +1,2 @@
 WEBBASE=	/data
+SGMLOPTS+=	-links -white -hdr ${.CURDIR}/../doc.hdr -ftr ${.CURDIR}/../doc.ftr
diff --git a/en/doc.ftr b/en/doc.ftr
index 38b0c7b771..46fb4b5fc7 100644
--- a/en/doc.ftr
+++ b/en/doc.ftr
@@ -1,8 +1,8 @@
-<hr>
-<a href="../"><img src="../gifs/home.gif" alt="FreeBSD Home
-  Page" border="0" align="right"></a>
+<hr noshade>
+<a href="../"><img src="../gifs/home.gif" alt="FreeBSD Home Page"
+border="0" align="right"></a>
 <address>
-  @@UPDATE@@<br>
-  <a href="../mailto.html">www@freebsd.org</a>
+  <a href="../mailto.html">www@freebsd.org</a><br>
+  @@UPDATE@@
 </address>
 
diff --git a/en/doc.hdr b/en/doc.hdr
index e69de29bb2..542828816a 100644
--- a/en/doc.hdr
+++ b/en/doc.hdr
@@ -0,0 +1 @@
+<img src="../gifs/topbar.gif" alt="">
diff --git a/en/web.mk b/en/web.mk
index b08215176f..68de0d92e0 100644
--- a/en/web.mk
+++ b/en/web.mk
@@ -1,5 +1,5 @@
 # bsd.web.mk
-# $Id: web.mk,v 1.5 1996-10-01 23:41:29 jfieber Exp $
+# $Id: web.mk,v 1.6 1996-10-06 00:08:08 jfieber Exp $
 
 #
 # Build and install a web site.
@@ -239,7 +239,7 @@ _PROGSUBDIR: .USE
 FORMATS?=	"html ps latin1 ascii"
 PARAMS=		DESTDIR=${DESTDIR} DOCDIR=${WEBBASE}/${WEBDIR}
 PARAMS+=	DOCOWN=${WEBOWN} DOCGRP=${WEBGRP}
-PARAMS+=	SGMLOPTS="-links" FORMATS=${FORMATS} COPY="${COPY}"
+PARAMS+=	FORMATS=${FORMATS} COPY="${COPY}"
 
 .endif
 
diff --git a/share/mk/web.site.mk b/share/mk/web.site.mk
index 2d46040c8b..df5c92369d 100644
--- a/share/mk/web.site.mk
+++ b/share/mk/web.site.mk
@@ -1,5 +1,5 @@
 # bsd.web.mk
-# $Id: web.site.mk,v 1.5 1996-10-01 23:41:29 jfieber Exp $
+# $Id: web.site.mk,v 1.6 1996-10-06 00:08:08 jfieber Exp $
 
 #
 # Build and install a web site.
@@ -239,7 +239,7 @@ _PROGSUBDIR: .USE
 FORMATS?=	"html ps latin1 ascii"
 PARAMS=		DESTDIR=${DESTDIR} DOCDIR=${WEBBASE}/${WEBDIR}
 PARAMS+=	DOCOWN=${WEBOWN} DOCGRP=${WEBGRP}
-PARAMS+=	SGMLOPTS="-links" FORMATS=${FORMATS} COPY="${COPY}"
+PARAMS+=	FORMATS=${FORMATS} COPY="${COPY}"
 
 .endif