diff --git a/de_DE.ISO8859-1/books/fdp-primer/Makefile b/de_DE.ISO8859-1/books/fdp-primer/Makefile
index 593fae312c..e0d302c0bf 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/Makefile
+++ b/de_DE.ISO8859-1/books/fdp-primer/Makefile
@@ -1,51 +1,51 @@
 #
 # $FreeBSD$
 # $FreeBSDde: de-docproj/books/fdp-primer/Makefile,v 1.2 2003/11/26 01:11:56 mheinen Exp $
 # basiert auf: 1.12
 #
 # Build the FreeBSD Documentation Project Primer.
 #
-MAINTAINER=nik@FreeBSD.org
+MAINTAINER=doc@FreeBSD.org
 
 DOC?= book
 
 FORMATS?= html-split html
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 #
 # 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
 SRCS+= overview/chapter.sgml
 SRCS+= psgml-mode/chapter.sgml
 SRCS+= see-also/chapter.sgml
 SRCS+= sgml-markup/chapter.sgml
 SRCS+= sgml-primer/chapter.sgml
 SRCS+= stylesheets/chapter.sgml
 SRCS+= structure/chapter.sgml
 SRCS+= doc-build/chapter.sgml
 SRCS+= the-website/chapter.sgml
 SRCS+= tools/chapter.sgml
 SRCS+= translations/chapter.sgml
 SRCS+= writing-style/chapter.sgml
 
 SRCS+= examples/appendix.sgml
 
 # Images from the cross-document image library
 IMAGES_LIB=	callouts/1.png
 IMAGES_LIB+=	callouts/2.png
 IMAGES_LIB+=	callouts/3.png
 IMAGES_LIB+=	callouts/4.png
 IMAGES_LIB+=	callouts/5.png
 
 # Entities
 SRCS+= chapters.ent
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/books/bibliography/Makefile b/en_US.ISO8859-1/books/bibliography/Makefile
index c6eaedd76b..e0e4b1ed5e 100644
--- a/en_US.ISO8859-1/books/bibliography/Makefile
+++ b/en_US.ISO8859-1/books/bibliography/Makefile
@@ -1,25 +1,25 @@
 # 
 # $FreeBSD$
 #
 #
 
-MAINTAINER=nik@FreeBSD.org
+MAINTAINER=doc@FreeBSD.org
 
 DOC?= book
 
 FORMATS?= html
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # 
 # 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"
diff --git a/en_US.ISO8859-1/books/faq/Makefile b/en_US.ISO8859-1/books/faq/Makefile
index b3489d7343..64c6799682 100644
--- a/en_US.ISO8859-1/books/faq/Makefile
+++ b/en_US.ISO8859-1/books/faq/Makefile
@@ -1,28 +1,28 @@
 # 
 # $FreeBSD$
 #
 # Build the FreeBSD FAQ
 #
 
-MAINTAINER=nik@FreeBSD.org
+MAINTAINER=doc@FreeBSD.org
 
 DOC?= book
 
 FORMATS?= html-split html
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 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"
diff --git a/en_US.ISO8859-1/books/fdp-primer/Makefile b/en_US.ISO8859-1/books/fdp-primer/Makefile
index 320b0859de..6e734106a9 100644
--- a/en_US.ISO8859-1/books/fdp-primer/Makefile
+++ b/en_US.ISO8859-1/books/fdp-primer/Makefile
@@ -1,50 +1,50 @@
 # 
 # $FreeBSD$
 #
 # Build the FreeBSD Documentation Project Primer.
 #
 
-MAINTAINER=nik@FreeBSD.org
+MAINTAINER=doc@FreeBSD.org
 
 DOC?= book
 
 FORMATS?= html-split html
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # 
 # 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 
 SRCS+= overview/chapter.sgml 
 SRCS+= psgml-mode/chapter.sgml 
 SRCS+= see-also/chapter.sgml 
 SRCS+= sgml-markup/chapter.sgml 
 SRCS+= sgml-primer/chapter.sgml 
 SRCS+= stylesheets/chapter.sgml 
 SRCS+= structure/chapter.sgml
 SRCS+= doc-build/chapter.sgml
 SRCS+= the-website/chapter.sgml 
 SRCS+= tools/chapter.sgml 
 SRCS+= translations/chapter.sgml
 SRCS+= writing-style/chapter.sgml 
 
 SRCS+= examples/appendix.sgml
 
 # Images from the cross-document image library
 IMAGES_LIB=	callouts/1.png
 IMAGES_LIB+=	callouts/2.png
 IMAGES_LIB+=	callouts/3.png
 IMAGES_LIB+=	callouts/4.png
 IMAGES_LIB+=	callouts/5.png
 
 # Entities
 SRCS+= chapters.ent 
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/books/porters-handbook/Makefile b/en_US.ISO8859-1/books/porters-handbook/Makefile
index 9a6dd03454..3d494eb7f4 100644
--- a/en_US.ISO8859-1/books/porters-handbook/Makefile
+++ b/en_US.ISO8859-1/books/porters-handbook/Makefile
@@ -1,29 +1,29 @@
 # 
 # $FreeBSD$
 #
 # Build the FreeBSD Porter's Handbook.
 #
 
-MAINTAINER=nik@FreeBSD.org
+MAINTAINER=doc@FreeBSD.org
 
 DOC?= book
 
 FORMATS?= html-split
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # 
 # 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
 
 # Use the local DSSSL file
 DSLHTML?= 	${.CURDIR}/freebsd.dsl
 DSLPRINT?= 	${.CURDIR}/freebsd.dsl
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/fr_FR.ISO8859-1/books/faq/Makefile b/fr_FR.ISO8859-1/books/faq/Makefile
index 1253ad3b9e..3ea4fd0be5 100644
--- a/fr_FR.ISO8859-1/books/faq/Makefile
+++ b/fr_FR.ISO8859-1/books/faq/Makefile
@@ -1,29 +1,29 @@
 #
 #    The FreeBSD Documentation Project
 #    The FreeBSD French Documentation Project
 #
 #    Compilation de la FAQ FreeBSD
 #
 #    $FreeBSD$
 #    Original revision: 1.7
-MAINTAINER=nik@FreeBSD.org
+MAINTAINER=doc@FreeBSD.org
 
 DOC?= book
 
 FORMATS?= html-split html
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 JADEFLAGS+=-Vbiblio-xref-title
 # 
 # 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"
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/Makefile b/fr_FR.ISO8859-1/books/fdp-primer/Makefile
index 8795d2ba9a..318d4fb71d 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/Makefile
+++ b/fr_FR.ISO8859-1/books/fdp-primer/Makefile
@@ -1,45 +1,45 @@
 #
 #    The FreeBSD Documentation Project
 #    The FreeBSD French Documentation Project
 #
 #    Compilation de l'Introduction au Projet de Documentation de FreeBSD
 #
-#    $FreeBSD: doc/fr_FR.ISO8859-1/books/fdp-primer/Makefile,v 1.4 2001/06/21 03:38:28 chris Exp $
+#    $FreeBSD$
 #    Original revision: 1.6
 # 
 
-MAINTAINER=nik@FreeBSD.ORG
+MAINTAINER=doc@FreeBSD.ORG
 
 DOC?= book
 
 FORMATS?= html-split html
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # 
 # 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 
 SRCS+= overview/chapter.sgml 
 SRCS+= psgml-mode/chapter.sgml 
 SRCS+= see-also/chapter.sgml 
 SRCS+= sgml-markup/chapter.sgml 
 SRCS+= sgml-primer/chapter.sgml 
 SRCS+= stylesheets/chapter.sgml 
 SRCS+= the-faq/chapter.sgml 
 SRCS+= the-handbook/chapter.sgml 
 SRCS+= the-website/chapter.sgml 
 SRCS+= tools/chapter.sgml 
 SRCS+= translations/chapter.sgml
 SRCS+= writing-style/chapter.sgml 
 
 # Entities
 SRCS+= chapters.ent 
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ja_JP.eucJP/books/ppp-primer/Makefile b/ja_JP.eucJP/books/ppp-primer/Makefile
index e21e455cc9..d0c4f0a3e3 100644
--- a/ja_JP.eucJP/books/ppp-primer/Makefile
+++ b/ja_JP.eucJP/books/ppp-primer/Makefile
@@ -1,29 +1,29 @@
 # 
 # $FreeBSD$
 #
 # FreeBSD Japanese Documentation Project
 # Original revision: 1.1
 #
 # Build the PPP PrimerQ
 #
 
-MAINTAINER=nik@FreeBSD.org
+MAINTAINER=doc@FreeBSD.org
 
 DOC?= book
 
 FORMATS?= html-split html
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # 
 # 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"