diff --git a/en_US.ISO8859-1/articles/committers-guide/Makefile b/en_US.ISO8859-1/articles/committers-guide/Makefile
index 51fe6d2820..3fd9f366c9 100644
--- a/en_US.ISO8859-1/articles/committers-guide/Makefile
+++ b/en_US.ISO8859-1/articles/committers-guide/Makefile
@@ -1,27 +1,27 @@
 # 
-# $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/Makefile,v 1.3 1999/09/06 06:52:35 peter Exp $
+# $FreeBSD$
 #
 # Build the FreeBSD New Committers Guide
 #
 
 MAINTAINER=jhb@FreeBSD.org
 
 DOC?= article
 
 FORMATS?= html
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-JADEFLAGS+=	-V %generate-article-toc%
+WITH_ARTICLE_TOC=YES
 
 # 
 # SRCS lists the individual SGML files that make up the document. Changes
 # to any of these files will force a rebuild
 #
 
 # SGML content
 SRCS=  article.sgml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/contributing/Makefile b/en_US.ISO8859-1/articles/contributing/Makefile
index 27aeb7f607..87264e55ec 100644
--- a/en_US.ISO8859-1/articles/contributing/Makefile
+++ b/en_US.ISO8859-1/articles/contributing/Makefile
@@ -1,16 +1,16 @@
 # $FreeBSD$
 
 DOC?= article
 
 FORMATS?= html
 
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-JADEFLAGS+=	-V %generate-article-toc%
+WITH_ARTICLE_TOC=YES
 
 SRCS= article.sgml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/contributors/Makefile b/en_US.ISO8859-1/articles/contributors/Makefile
index 27aeb7f607..87264e55ec 100644
--- a/en_US.ISO8859-1/articles/contributors/Makefile
+++ b/en_US.ISO8859-1/articles/contributors/Makefile
@@ -1,16 +1,16 @@
 # $FreeBSD$
 
 DOC?= article
 
 FORMATS?= html
 
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-JADEFLAGS+=	-V %generate-article-toc%
+WITH_ARTICLE_TOC=YES
 
 SRCS= article.sgml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/cvsup-advanced/Makefile b/en_US.ISO8859-1/articles/cvsup-advanced/Makefile
index 27aeb7f607..87264e55ec 100644
--- a/en_US.ISO8859-1/articles/cvsup-advanced/Makefile
+++ b/en_US.ISO8859-1/articles/cvsup-advanced/Makefile
@@ -1,16 +1,16 @@
 # $FreeBSD$
 
 DOC?= article
 
 FORMATS?= html
 
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-JADEFLAGS+=	-V %generate-article-toc%
+WITH_ARTICLE_TOC=YES
 
 SRCS= article.sgml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/hubs/Makefile b/en_US.ISO8859-1/articles/hubs/Makefile
index 27aeb7f607..87264e55ec 100644
--- a/en_US.ISO8859-1/articles/hubs/Makefile
+++ b/en_US.ISO8859-1/articles/hubs/Makefile
@@ -1,16 +1,16 @@
 # $FreeBSD$
 
 DOC?= article
 
 FORMATS?= html
 
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-JADEFLAGS+=	-V %generate-article-toc%
+WITH_ARTICLE_TOC=YES
 
 SRCS= article.sgml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/pam/Makefile b/en_US.ISO8859-1/articles/pam/Makefile
index d19510ec77..fe6b103d31 100644
--- a/en_US.ISO8859-1/articles/pam/Makefile
+++ b/en_US.ISO8859-1/articles/pam/Makefile
@@ -1,27 +1,28 @@
 # $FreeBSD$
 
 DOC?= article
 
 FORMATS?= html
 
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-JADEFLAGS+=	-V %generate-article-toc%
+WITH_ARTICLE_TOC=YES
+WITH_INLINE_LEGALNOTICE=YES
 
 SRCS= article.sgml pam_app.c pam_conv.c pam_module.c
 
 CLEANFILES+= pam_app.c pam_conv.c pam_module.c
 
 pam_app.c: su.c
 	sed -e '/^[\/ ]\*/d' ${.ALLSRC} >${.TARGET}
 
 pam_conv.c: converse.c
 	sed -e '/^[\/ ]\*/d' ${.ALLSRC} >${.TARGET}
 
 pam_module.c: pam_unix.c
 	sed -e '/^[\/ ]\*/d' ${.ALLSRC} >${.TARGET}
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/pr-guidelines/Makefile b/en_US.ISO8859-1/articles/pr-guidelines/Makefile
index 36fc8e67d0..ea2ae7b7dc 100644
--- a/en_US.ISO8859-1/articles/pr-guidelines/Makefile
+++ b/en_US.ISO8859-1/articles/pr-guidelines/Makefile
@@ -1,16 +1,16 @@
 # $FreeBSD$
 
 DOC?= article
 
 FORMATS?= html
 
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-JADEFLAGS+=	-V %generate-article-toc%
+WITH_ARTICLE_TOC=YES
 
 SRCS=  article.sgml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/problem-reports/Makefile b/en_US.ISO8859-1/articles/problem-reports/Makefile
index 27aeb7f607..87264e55ec 100644
--- a/en_US.ISO8859-1/articles/problem-reports/Makefile
+++ b/en_US.ISO8859-1/articles/problem-reports/Makefile
@@ -1,16 +1,16 @@
 # $FreeBSD$
 
 DOC?= article
 
 FORMATS?= html
 
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-JADEFLAGS+=	-V %generate-article-toc%
+WITH_ARTICLE_TOC=YES
 
 SRCS= article.sgml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/releng/Makefile b/en_US.ISO8859-1/articles/releng/Makefile
index deb0739ee4..23d27d4aa6 100644
--- a/en_US.ISO8859-1/articles/releng/Makefile
+++ b/en_US.ISO8859-1/articles/releng/Makefile
@@ -1,25 +1,25 @@
 # 
 # $FreeBSD$
 #
 # Article: FreeBSD Release Engineering
 
 DOC?= article
 
 FORMATS?= html
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-JADEFLAGS+=	-V %generate-article-toc%
+WITH_ARTICLE_TOC=YES
 
 # SGML content
 SRCS=  article.sgml branches.ascii
 
 # IMAGES
 IMAGES= branches.pic
 
 CSS_SHEET_ADDITIONS= extra.css
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/smp/Makefile b/en_US.ISO8859-1/articles/smp/Makefile
index 85675c8e15..d6d4fcec9f 100644
--- a/en_US.ISO8859-1/articles/smp/Makefile
+++ b/en_US.ISO8859-1/articles/smp/Makefile
@@ -1,18 +1,18 @@
 # $FreeBSD$
 
 MAINTAINER=jhb@FreeBSD.org
 
 DOC?= article
 
 FORMATS?= html
 
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-JADEFLAGS+=	-V %generate-article-toc%
+WITH_ARTICLE_TOC=YES
 
 SRCS=	article.sgml
 
 DOC_PREFIX?=	${.CURDIR}/../../..
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/solid-state/Makefile b/en_US.ISO8859-1/articles/solid-state/Makefile
index 9c83b48577..94354ccd05 100644
--- a/en_US.ISO8859-1/articles/solid-state/Makefile
+++ b/en_US.ISO8859-1/articles/solid-state/Makefile
@@ -1,24 +1,24 @@
 # 
-# $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/Makefile,v 1.4 2001/04/08 17:26:59 nik Exp $
+# $FreeBSD$
 #
 #
 
 DOC?= article
 
 FORMATS?= html
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-JADEFLAGS+=	-V %generate-article-toc%
+WITH_ARTICLE_TOC=YES
 
 # 
 # SRCS lists the individual SGML files that make up the document. Changes
 # to any of these files will force a rebuild
 #
 
 # SGML content
 SRCS=  article.sgml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/books/faq/Makefile b/en_US.ISO8859-1/books/faq/Makefile
index 39b7d0cf2c..e6205e1ca3 100644
--- a/en_US.ISO8859-1/books/faq/Makefile
+++ b/en_US.ISO8859-1/books/faq/Makefile
@@ -1,27 +1,27 @@
 # 
-# $FreeBSD: doc/en_US.ISO_8859-1/books/faq/Makefile,v 1.6 1999/09/06 06:52:39 peter Exp $
+# $FreeBSD$
 #
 # Build the FreeBSD FAQ
 #
 
 MAINTAINER=nik@FreeBSD.org
 
 DOC?= book
 
 FORMATS?= html-split html
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-JADEFLAGS+=-Vbiblio-xref-title
+WITH_BIBLIOXREF_TITLE=YES
 # 
 # SRCS lists the individual SGML files that make up the document. Changes
 # to any of these files will force a rebuild
 #
 
 # SGML content
 SRCS=  book.sgml 
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"