diff --git a/en/handbook/README b/en/handbook/README
index 138da4c548..8772c3f1ac 100644
--- a/en/handbook/README
+++ b/en/handbook/README
@@ -637,3 +637,7 @@ for example,
61. Removed the prompt.* entities from handbook.sgml and added them to
freebsd.dtd.
+
+ 62. Do step 60, but for version 1.8 of doc/handbook/lists.sgml. Call
+ the transformed file mailing-lists.ent, and add an ENTITY line for
+ it to handbook.sgml
diff --git a/en/handbook/handbook.sgml b/en/handbook/handbook.sgml
index 8d60287840..e495f2da8f 100644
--- a/en/handbook/handbook.sgml
+++ b/en/handbook/handbook.sgml
@@ -1,6 +1,7 @@
<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V3.0-Based Extension//EN" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
<!ENTITY % authors SYSTEM "authors.ent"> %authors;
+<!ENTITY % mailing-lists SYSTEM "mailing-lists.ent"> %mailing-lists;
]>
diff --git a/en/handbook/mailing-lists.ent b/en/handbook/mailing-lists.ent
new file mode 100644
index 0000000000..224f586b93
--- /dev/null
+++ b/en/handbook/mailing-lists.ent
@@ -0,0 +1,48 @@
+<!--
+ Names of FreeBSD mailing lists and related software.
+
+ $Id: mailing-lists.ent,v 1.1 1998-11-03 23:46:32 nik Exp $
+-->
+
+<!ENTITY a.announce "FreeBSD announcements mailing list
+ <email>freebsd-announce@FreeBSD.ORG</email>">
+
+<!ENTITY a.cvsall "FreeBSD CVS commit message mailing list
+ <email>cvs-all@FreeBSD.ORG</email>">
+
+<!ENTITY a.doc "FreeBSD documentation project mailing list
+ <email>freebsd-doc@FreeBSD.ORG</email>">
+
+<!ENTITY a.bugs "FreeBSD problem reports mailing list
+ <email>freebsd-bugs@FreeBSD.ORG</email>">
+
+<!ENTITY a.current "FreeBSD-current mailing list
+ <email>freebsd-current@FreeBSD.ORG</email>">
+
+<!ENTITY a.emulation "FreeBSD-emulation mailing list
+ <email>freebsd-emulation@FreeBSD.ORG</email>">
+
+<!ENTITY a.fs "FreeBSD filesystem project mailing list
+ <email>freebsd-fs@FreeBSD.ORG</email>">
+
+<!ENTITY a.hackers "FreeBSD technical discussions mailing list
+ <email>freebsd-hackers@FreeBSD.ORG</email>">
+
+<!ENTITY a.ports "FreeBSD ports mailing list
+ <email>freebsd-ports@FreeBSD.ORG</email>">
+
+<!ENTITY a.questions "FreeBSD general questions mailing list
+ <email>freebsd-questions@FreeBSD.ORG</email>">
+
+<!ENTITY a.scsi "FreeBSD SCSI subsystem mailing list
+ <email>freebsd-scsi@FreeBSD.ORG</email>">
+
+<!ENTITY a.stable "FreeBSD-stable mailing list
+ <email>freebsd-stable@FreeBSD.ORG</email>">
+
+<!ENTITY a.majordomo "<email>majordomo@FreeBSD.ORG</email>">
+
+<!ENTITY a.core "FreeBSD core team
+ <email>freebsd-core@FreeBSD.ORG</email>">
+
+
diff --git a/en_US.ISO8859-1/books/handbook/book.sgml b/en_US.ISO8859-1/books/handbook/book.sgml
index 8d60287840..e495f2da8f 100644
--- a/en_US.ISO8859-1/books/handbook/book.sgml
+++ b/en_US.ISO8859-1/books/handbook/book.sgml
@@ -1,6 +1,7 @@
<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V3.0-Based Extension//EN" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
<!ENTITY % authors SYSTEM "authors.ent"> %authors;
+<!ENTITY % mailing-lists SYSTEM "mailing-lists.ent"> %mailing-lists;
]>
diff --git a/en_US.ISO8859-1/books/handbook/mailing-lists.ent b/en_US.ISO8859-1/books/handbook/mailing-lists.ent
new file mode 100644
index 0000000000..224f586b93
--- /dev/null
+++ b/en_US.ISO8859-1/books/handbook/mailing-lists.ent
@@ -0,0 +1,48 @@
+<!--
+ Names of FreeBSD mailing lists and related software.
+
+ $Id: mailing-lists.ent,v 1.1 1998-11-03 23:46:32 nik Exp $
+-->
+
+<!ENTITY a.announce "FreeBSD announcements mailing list
+ <email>freebsd-announce@FreeBSD.ORG</email>">
+
+<!ENTITY a.cvsall "FreeBSD CVS commit message mailing list
+ <email>cvs-all@FreeBSD.ORG</email>">
+
+<!ENTITY a.doc "FreeBSD documentation project mailing list
+ <email>freebsd-doc@FreeBSD.ORG</email>">
+
+<!ENTITY a.bugs "FreeBSD problem reports mailing list
+ <email>freebsd-bugs@FreeBSD.ORG</email>">
+
+<!ENTITY a.current "FreeBSD-current mailing list
+ <email>freebsd-current@FreeBSD.ORG</email>">
+
+<!ENTITY a.emulation "FreeBSD-emulation mailing list
+ <email>freebsd-emulation@FreeBSD.ORG</email>">
+
+<!ENTITY a.fs "FreeBSD filesystem project mailing list
+ <email>freebsd-fs@FreeBSD.ORG</email>">
+
+<!ENTITY a.hackers "FreeBSD technical discussions mailing list
+ <email>freebsd-hackers@FreeBSD.ORG</email>">
+
+<!ENTITY a.ports "FreeBSD ports mailing list
+ <email>freebsd-ports@FreeBSD.ORG</email>">
+
+<!ENTITY a.questions "FreeBSD general questions mailing list
+ <email>freebsd-questions@FreeBSD.ORG</email>">
+
+<!ENTITY a.scsi "FreeBSD SCSI subsystem mailing list
+ <email>freebsd-scsi@FreeBSD.ORG</email>">
+
+<!ENTITY a.stable "FreeBSD-stable mailing list
+ <email>freebsd-stable@FreeBSD.ORG</email>">
+
+<!ENTITY a.majordomo "<email>majordomo@FreeBSD.ORG</email>">
+
+<!ENTITY a.core "FreeBSD core team
+ <email>freebsd-core@FreeBSD.ORG</email>">
+
+
diff --git a/en_US.ISO_8859-1/books/handbook/book.sgml b/en_US.ISO_8859-1/books/handbook/book.sgml
index 8d60287840..e495f2da8f 100644
--- a/en_US.ISO_8859-1/books/handbook/book.sgml
+++ b/en_US.ISO_8859-1/books/handbook/book.sgml
@@ -1,6 +1,7 @@
<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V3.0-Based Extension//EN" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
<!ENTITY % authors SYSTEM "authors.ent"> %authors;
+<!ENTITY % mailing-lists SYSTEM "mailing-lists.ent"> %mailing-lists;
]>
diff --git a/en_US.ISO_8859-1/books/handbook/mailing-lists.ent b/en_US.ISO_8859-1/books/handbook/mailing-lists.ent
new file mode 100644
index 0000000000..224f586b93
--- /dev/null
+++ b/en_US.ISO_8859-1/books/handbook/mailing-lists.ent
@@ -0,0 +1,48 @@
+<!--
+ Names of FreeBSD mailing lists and related software.
+
+ $Id: mailing-lists.ent,v 1.1 1998-11-03 23:46:32 nik Exp $
+-->
+
+<!ENTITY a.announce "FreeBSD announcements mailing list
+ <email>freebsd-announce@FreeBSD.ORG</email>">
+
+<!ENTITY a.cvsall "FreeBSD CVS commit message mailing list
+ <email>cvs-all@FreeBSD.ORG</email>">
+
+<!ENTITY a.doc "FreeBSD documentation project mailing list
+ <email>freebsd-doc@FreeBSD.ORG</email>">
+
+<!ENTITY a.bugs "FreeBSD problem reports mailing list
+ <email>freebsd-bugs@FreeBSD.ORG</email>">
+
+<!ENTITY a.current "FreeBSD-current mailing list
+ <email>freebsd-current@FreeBSD.ORG</email>">
+
+<!ENTITY a.emulation "FreeBSD-emulation mailing list
+ <email>freebsd-emulation@FreeBSD.ORG</email>">
+
+<!ENTITY a.fs "FreeBSD filesystem project mailing list
+ <email>freebsd-fs@FreeBSD.ORG</email>">
+
+<!ENTITY a.hackers "FreeBSD technical discussions mailing list
+ <email>freebsd-hackers@FreeBSD.ORG</email>">
+
+<!ENTITY a.ports "FreeBSD ports mailing list
+ <email>freebsd-ports@FreeBSD.ORG</email>">
+
+<!ENTITY a.questions "FreeBSD general questions mailing list
+ <email>freebsd-questions@FreeBSD.ORG</email>">
+
+<!ENTITY a.scsi "FreeBSD SCSI subsystem mailing list
+ <email>freebsd-scsi@FreeBSD.ORG</email>">
+
+<!ENTITY a.stable "FreeBSD-stable mailing list
+ <email>freebsd-stable@FreeBSD.ORG</email>">
+
+<!ENTITY a.majordomo "<email>majordomo@FreeBSD.ORG</email>">
+
+<!ENTITY a.core "FreeBSD core team
+ <email>freebsd-core@FreeBSD.ORG</email>">
+
+