diff --git a/en_US.ISO8859-1/books/faq/Makefile b/en_US.ISO8859-1/books/faq/Makefile
index 082b001e91..9c9e480cf5 100644
--- a/en_US.ISO8859-1/books/faq/Makefile
+++ b/en_US.ISO8859-1/books/faq/Makefile
@@ -1,26 +1,26 @@
 # 
-# $Id: Makefile,v 1.1 1999-08-17 21:52:02 nik Exp $
+# $Id: Makefile,v 1.2 1999-08-28 19:49:31 jhb Exp $
 #
 # Build the FreeBSD FAQ
 #
 
-MAINTAINER=nik@FreeBSD.ORG
+MAINTAINER=nik@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?= ../../..
 
 .include "../../../share/mk/docproj.docbook.mk"
diff --git a/en_US.ISO8859-1/books/fdp-primer/Makefile b/en_US.ISO8859-1/books/fdp-primer/Makefile
index 721b5e366f..84d7515208 100644
--- a/en_US.ISO8859-1/books/fdp-primer/Makefile
+++ b/en_US.ISO8859-1/books/fdp-primer/Makefile
@@ -1,41 +1,41 @@
 # 
-# $Id: Makefile,v 1.3 1999-07-14 22:31:29 nik Exp $
+# $Id: Makefile,v 1.4 1999-08-28 19:49:38 jhb Exp $
 #
 # Build the FreeBSD Documentation Project Primer.
 #
 
-MAINTAINER=nik@FreeBSD.ORG
+MAINTAINER=nik@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?= ../../..
 
 .include "../../../share/mk/docproj.docbook.mk"
diff --git a/en_US.ISO8859-1/books/handbook/Makefile b/en_US.ISO8859-1/books/handbook/Makefile
index ae4e1754f4..4f544d0096 100644
--- a/en_US.ISO8859-1/books/handbook/Makefile
+++ b/en_US.ISO8859-1/books/handbook/Makefile
@@ -1,59 +1,59 @@
 # 
-# $Id: Makefile,v 1.22 1999-08-17 21:35:54 nik Exp $
+# $Id: Makefile,v 1.23 1999-08-28 19:49:39 jhb Exp $
 #
 # Build the FreeBSD Handbook.
 #
 
-MAINTAINER=nik@FreeBSD.ORG
+MAINTAINER=nik@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
 SRCS+= advanced-networking/chapter.sgml
 SRCS+= backups/chapter.sgml
 SRCS+= basics/chapter.sgml
 SRCS+= bibliography/chapter.sgml
 SRCS+= contrib/chapter.sgml
 SRCS+= cutting-edge/chapter.sgml
 SRCS+= disks/chapter.sgml
 SRCS+= eresources/chapter.sgml
 SRCS+= hw/chapter.sgml
 SRCS+= install/chapter.sgml
 SRCS+= internals/chapter.sgml
 SRCS+= introduction/chapter.sgml
 SRCS+= kernelconfig/chapter.sgml
 SRCS+= kerneldebug/chapter.sgml
 SRCS+= kernelopts/chapter.sgml
 SRCS+= l10n/chapter.sgml
 SRCS+= linuxemu/chapter.sgml
 SRCS+= mail/chapter.sgml
 SRCS+= mirrors/chapter.sgml
 SRCS+= pgpkeys/chapter.sgml
 SRCS+= policies/chapter.sgml
 SRCS+= ppp-and-slip/chapter.sgml
 SRCS+= printing/chapter.sgml
 SRCS+= quotas/chapter.sgml
 SRCS+= security/chapter.sgml
 SRCS+= serialcomms/chapter.sgml
 SRCS+= staff/chapter.sgml
 SRCS+= x11/chapter.sgml
 SRCS+= ports/chapter.sgml
 
 # Entities
 SRCS+= authors.ent 
 SRCS+= chapters.ent 
 SRCS+= mailing-lists.ent
 
 DOC_PREFIX?= ../../..
 .include "../../../share/mk/docproj.docbook.mk"
diff --git a/en_US.ISO_8859-1/books/faq/Makefile b/en_US.ISO_8859-1/books/faq/Makefile
index 082b001e91..9c9e480cf5 100644
--- a/en_US.ISO_8859-1/books/faq/Makefile
+++ b/en_US.ISO_8859-1/books/faq/Makefile
@@ -1,26 +1,26 @@
 # 
-# $Id: Makefile,v 1.1 1999-08-17 21:52:02 nik Exp $
+# $Id: Makefile,v 1.2 1999-08-28 19:49:31 jhb Exp $
 #
 # Build the FreeBSD FAQ
 #
 
-MAINTAINER=nik@FreeBSD.ORG
+MAINTAINER=nik@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?= ../../..
 
 .include "../../../share/mk/docproj.docbook.mk"
diff --git a/en_US.ISO_8859-1/books/fdp-primer/Makefile b/en_US.ISO_8859-1/books/fdp-primer/Makefile
index 721b5e366f..84d7515208 100644
--- a/en_US.ISO_8859-1/books/fdp-primer/Makefile
+++ b/en_US.ISO_8859-1/books/fdp-primer/Makefile
@@ -1,41 +1,41 @@
 # 
-# $Id: Makefile,v 1.3 1999-07-14 22:31:29 nik Exp $
+# $Id: Makefile,v 1.4 1999-08-28 19:49:38 jhb Exp $
 #
 # Build the FreeBSD Documentation Project Primer.
 #
 
-MAINTAINER=nik@FreeBSD.ORG
+MAINTAINER=nik@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?= ../../..
 
 .include "../../../share/mk/docproj.docbook.mk"
diff --git a/en_US.ISO_8859-1/books/handbook/Makefile b/en_US.ISO_8859-1/books/handbook/Makefile
index ae4e1754f4..4f544d0096 100644
--- a/en_US.ISO_8859-1/books/handbook/Makefile
+++ b/en_US.ISO_8859-1/books/handbook/Makefile
@@ -1,59 +1,59 @@
 # 
-# $Id: Makefile,v 1.22 1999-08-17 21:35:54 nik Exp $
+# $Id: Makefile,v 1.23 1999-08-28 19:49:39 jhb Exp $
 #
 # Build the FreeBSD Handbook.
 #
 
-MAINTAINER=nik@FreeBSD.ORG
+MAINTAINER=nik@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
 SRCS+= advanced-networking/chapter.sgml
 SRCS+= backups/chapter.sgml
 SRCS+= basics/chapter.sgml
 SRCS+= bibliography/chapter.sgml
 SRCS+= contrib/chapter.sgml
 SRCS+= cutting-edge/chapter.sgml
 SRCS+= disks/chapter.sgml
 SRCS+= eresources/chapter.sgml
 SRCS+= hw/chapter.sgml
 SRCS+= install/chapter.sgml
 SRCS+= internals/chapter.sgml
 SRCS+= introduction/chapter.sgml
 SRCS+= kernelconfig/chapter.sgml
 SRCS+= kerneldebug/chapter.sgml
 SRCS+= kernelopts/chapter.sgml
 SRCS+= l10n/chapter.sgml
 SRCS+= linuxemu/chapter.sgml
 SRCS+= mail/chapter.sgml
 SRCS+= mirrors/chapter.sgml
 SRCS+= pgpkeys/chapter.sgml
 SRCS+= policies/chapter.sgml
 SRCS+= ppp-and-slip/chapter.sgml
 SRCS+= printing/chapter.sgml
 SRCS+= quotas/chapter.sgml
 SRCS+= security/chapter.sgml
 SRCS+= serialcomms/chapter.sgml
 SRCS+= staff/chapter.sgml
 SRCS+= x11/chapter.sgml
 SRCS+= ports/chapter.sgml
 
 # Entities
 SRCS+= authors.ent 
 SRCS+= chapters.ent 
 SRCS+= mailing-lists.ent
 
 DOC_PREFIX?= ../../..
 .include "../../../share/mk/docproj.docbook.mk"