diff --git a/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml b/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml
index d13d0be3cc..73f9e4cc32 100644
--- a/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml
@@ -107,7 +107,7 @@
 	    <row>
 	      <entry>freebsd-current</entry>
 	      <entry>Discussion concerning the use of
-		FreeBSD-current</entry>
+		&os.current;</entry>
 	    </row>
 	    
 	    <row>
@@ -151,7 +151,7 @@
 	    <row>
 	      <entry>freebsd-stable</entry>
 	      <entry>Discussion concerning the use of
-		FreeBSD-stable</entry>
+		&os.stable;</entry>
 	    </row>
 
 	    <row>
@@ -253,7 +253,7 @@
 		
 	    <row>
 	      <entry>freebsd-gnome</entry>
-	      <entry>Porting GNOME and GNOME applications</entry>
+	      <entry>Porting <application>GNOME</application> and <application>GNOME</application> applications</entry>
 	    </row>
 		
 	    <row>
@@ -312,7 +312,7 @@
 	    
 	    <row>
 	      <entry>freebsd-mozilla</entry>
-	      <entry>Porting mozilla to FreeBSD</entry>
+	      <entry>Porting <application>Mozilla</application> to FreeBSD</entry>
 	    </row>
 	    
 	    <row>
@@ -330,6 +330,12 @@
 	      <entry>Networking discussion and TCP/IP source code</entry>
 	    </row>
 	    
+	    <row>
+	      <entry>freebsd-openoffice</entry>
+	      <entry>Porting <application>OpenOffice</application> and
+		<application>StarOffice</application> to FreeBSD</entry>
+	    </row>
+
 	    <row>
 	      <entry>freebsd-platforms</entry>
 	      <entry>Concerning ports to non-Intel architecture
@@ -621,7 +627,7 @@ help
 	    only to 2 when a clear and obvious need to post to both lists
 	    exists.  For most lists, there is already a great deal of
 	    subscriber overlap and except for the most esoteric mixes (say
-	    "-stable &amp; -scsi"), there really is no reason to post to more
+	    <quote>-stable &amp; -scsi</quote>), there really is no reason to post to more
 	    than one list at a time.  If a message is sent to you in such a
 	    way that multiple mailing lists appear on the 
 	    <literal>Cc</literal> line then the <literal>Cc</literal>
@@ -818,12 +824,12 @@ help
 		
 	  <listitem>
 	    <para><emphasis>Discussions about the use of
-		FreeBSD-current</emphasis></para>
+		&os.current;</emphasis></para>
 
-	    <para>This is the mailing list for users of freebsd-current.  It
-	      includes warnings about new features coming out in -current that
+	    <para>This is the mailing list for users of &os.current;.  It
+	      includes warnings about new features coming out in -CURRENT that
 	      will affect the users, and instructions on steps that must be
-	      taken to remain -current.  Anyone running <quote>current</quote>
+	      taken to remain -CURRENT.  Anyone running <quote>CURRENT</quote>
 	      must subscribe to this list.  This is a technical mailing list
 	      for which strictly technical content is expected.</para>
 	  </listitem>
@@ -834,7 +840,7 @@ help
 	  
 	  <listitem>
 	    <para><emphasis>Discussions about the use of
-		FreeBSD-current</emphasis></para>
+		&os.current;</emphasis></para>
 
 	    <para>This is the digest version of the freebsd-current mailing
 	      list.  The digest consists of all messages sent to
@@ -903,8 +909,8 @@ help
 	  <listitem>
 	    <para><emphasis>GNOME</emphasis></para>
 	    
-	    <para>Discussions concerning The GNOME Desktop Environment for 
-              FreeBSD filesystems.  This is a technical mailing list for
+	    <para>Discussions concerning The <application>GNOME</application> Desktop Environment for 
+              FreeBSD systems.  This is a technical mailing list for
 	      which strictly technical content is expected.</para>
 	  </listitem>
 	</varlistentry>
@@ -1057,6 +1063,18 @@ help
 	  </listitem>
 	</varlistentry>
 
+	<varlistentry>
+	  <term>FREEBSD-OPENOFFICE</term>
+
+	  <listitem>
+	    <para><emphasis>OpenOffice</emphasis></para>
+
+	    <para>Discussions concerning the porting and maintenance
+	      of <application>OpenOffice</application> and
+	      <application>StarOffice</application>.</para>
+	   </listitem>
+	</varlistentry>
+
 	<varlistentry>
 	  <term>FREEBSD-PLATFORMS</term>
 		
@@ -1176,12 +1194,12 @@ help
 		
 	  <listitem>
 	    <para><emphasis>Discussions about the use of
-		FreeBSD-stable</emphasis></para>
+		&os.stable;</emphasis></para>
 	    
-	    <para>This is the mailing list for users of freebsd-stable.  It
-	      includes warnings about new features coming out in -stable that
+	    <para>This is the mailing list for users of &os.stable;.  It
+	      includes warnings about new features coming out in -STABLE that
 	      will affect the users, and instructions on steps that must be
-	      taken to remain -stable.  Anyone running <quote>stable</quote>
+	      taken to remain -STABLE.  Anyone running <quote>STABLE</quote>
 	      should subscribe to this list.  This is a technical mailing list
 	      for which strictly technical content is expected.</para>
 	  </listitem>