diff --git a/en_US.ISO8859-1/share/sgml/mailing-lists.ent b/en_US.ISO8859-1/share/sgml/mailing-lists.ent
index c577a2d926..0b4b1840b6 100644
--- a/en_US.ISO8859-1/share/sgml/mailing-lists.ent
+++ b/en_US.ISO8859-1/share/sgml/mailing-lists.ent
@@ -1,335 +1,329 @@
 <!--
      Names of FreeBSD mailing lists and related software.
 
      $FreeBSD$
 -->
 
 <!ENTITY a.mailman.listinfo "http://lists.FreeBSD.org/mailman/listinfo">
 <!ENTITY a.mailman.lists "<ulink url='&a.mailman.listinfo;'>FreeBSD list server</ulink>">
 <!ENTITY a.mailman.lists.link "<ulink url='&a.mailman.listinfo;'>&a.mailman.listinfo;</ulink>">
 
 <!ENTITY a.advocacy.url "&a.mailman.listinfo;/freebsd-advocacy">
 <!ENTITY a.advocacy "<ulink url='&a.advocacy.url;'>FreeBSD advocacy mailing list</ulink>">
 <!ENTITY a.advocacy.name "<ulink url='&a.advocacy.url;'>freebsd-advocacy</ulink>">
 
 <!ENTITY a.afs.url "&a.mailman.listinfo;/freebsd-afs">
-<!ENTITY a.afs "<ulink url='&a.mailman.listinfo;/freebsd-afs'>FreeBSD AFS porting mailing list</ulink>">
+<!ENTITY a.afs "<ulink url='&a.afs.url;'>FreeBSD AFS porting mailing list</ulink>">
 <!ENTITY a.afs.name "<ulink url='&a.afs.url;'>freebsd-afs</ulink>">
 
-<!ENTITY a.aic7xxx.url "&a.mailman.listinfo;/freebsd-aic7xxx">
-<!ENTITY a.aic7xxx "<ulink url='&a.mailman.listinfo;/freebsd-aic7xxx'>FreeBSD Adaptec AIC7xxx discussions mailing list</ulink>">
+<!ENTITY a.aic7xxx.url "&a.mailman.listinfo;/aic7xxx">
+<!ENTITY a.aic7xxx "<ulink url='&a.aic7xxx.url;'>FreeBSD Adaptec AIC7xxx discussions mailing list</ulink>">
 <!ENTITY a.aic7xxx.name "<ulink url='&a.aic7xxx.url;'>freebsd-aic7xxx</ulink>">
 
 <!ENTITY a.alpha.url "&a.mailman.listinfo;/freebsd-alpha">
-<!ENTITY a.alpha "<ulink url='&a.mailman.listinfo;/freebsd-alpha'>FreeBSD Alpha porting mailing list</ulink>">
+<!ENTITY a.alpha "<ulink url='&a.alpha.url;'>FreeBSD Alpha porting mailing list</ulink>">
 <!ENTITY a.alpha.name "<ulink url='&a.alpha.url;'>freebsd-alpha</ulink>">
 
 <!ENTITY a.announce.url "&a.mailman.listinfo;/freebsd-announce">
-<!ENTITY a.announce "<ulink url='&a.mailman.listinfo;/freebsd-announce'>FreeBSD announcements mailing list</ulink>">
+<!ENTITY a.announce "<ulink url='&a.announce.url;'>FreeBSD announcements mailing list</ulink>">
 <!ENTITY a.announce.name "<ulink url='&a.announce.url;'>freebsd-announce</ulink>">
 
 <!ENTITY a.arch.url "&a.mailman.listinfo;/freebsd-arch">
-<!ENTITY a.arch "<ulink url='&a.mailman.listinfo;/freebsd-arch'>FreeBSD architecture and design mailing list</ulink>">
+<!ENTITY a.arch "<ulink url='&a.arch.url;'>FreeBSD architecture and design mailing list</ulink>">
 <!ENTITY a.arch.name "<ulink url='&a.arch.url;'>freebsd-arch</ulink>">
 
 <!ENTITY a.arm.url "&a.mailman.listinfo;/freebsd-arm">
-<!ENTITY a.arm "<ulink url='&a.mailman.listinfo;/freebsd-arm'>FreeBSD ARM porting mailing list</ulink>">
+<!ENTITY a.arm "<ulink url='&a.arm.url;'>FreeBSD ARM porting mailing list</ulink>">
 <!ENTITY a.arm.name "<ulink url='&a.arm.url;'>freebsd-arm</ulink>">
 
 <!ENTITY a.atm.url "&a.mailman.listinfo;/freebsd-atm">
-<!ENTITY a.atm "<ulink url='&a.mailman.listinfo;/freebsd-atm'>FreeBSD ATM networking mailing list</ulink>">
+<!ENTITY a.atm "<ulink url='&a.atm.url;'>FreeBSD ATM networking mailing list</ulink>">
 <!ENTITY a.atm.name "<ulink url='&a.atm.url;'>freebsd-atm</ulink>">
 
 <!ENTITY a.audit.url "&a.mailman.listinfo;/freebsd-audit">
-<!ENTITY a.audit "<ulink url='&a.mailman.listinfo;/freebsd-audit'>FreeBSD source code audit mailing list</ulink>">
+<!ENTITY a.audit "<ulink url='&a.audit.url;'>FreeBSD source code audit mailing list</ulink>">
 <!ENTITY a.audit.name "<ulink url='&a.audit.url;'>freebsd-audit</ulink>">
 
 <!ENTITY a.binup.url "&a.mailman.listinfo;/freebsd-binup">
-<!ENTITY a.binup "<ulink url='&a.mailman.listinfo;/freebsd-binup'>FreeBSD binary update system mailing list</ulink>">
+<!ENTITY a.binup "<ulink url='&a.binup.url;'>FreeBSD binary update system mailing list</ulink>">
 <!ENTITY a.binup.name "<ulink url='&a.binup.url;'>freebsd-binup</ulink>">
 
 <!ENTITY a.bugbusters.url "&a.mailman.listinfo;/freebsd-bugbusters">
-<!ENTITY a.bugbusters "<ulink url='&a.mailman.listinfo;/freebsd-bugbusters'>FreeBSD bugbusters mailing list</ulink>">
+<!ENTITY a.bugbusters "<ulink url='&a.bugbusters.url;'>FreeBSD bugbusters mailing list</ulink>">
 <!ENTITY a.bugbusters.name "<ulink url='&a.bugbusters.url;'>freebsd-bugbusters</ulink>">
 
 <!ENTITY a.bugs.url "&a.mailman.listinfo;/freebsd-bugs">
-<!ENTITY a.bugs "<ulink url='&a.mailman.listinfo;/freebsd-bugs'>FreeBSD problem reports mailing list</ulink>">
+<!ENTITY a.bugs "<ulink url='&a.bugs.url;'>FreeBSD problem reports mailing list</ulink>">
 <!ENTITY a.bugs.name "<ulink url='&a.bugs.url;'>freebsd-bugs</ulink>">
 
 <!ENTITY a.chat.url "&a.mailman.listinfo;/freebsd-chat">
-<!ENTITY a.chat "<ulink url='&a.mailman.listinfo;/freebsd-chat'>FreeBSD chat mailing list</ulink>">
+<!ENTITY a.chat "<ulink url='&a.chat.url;'>FreeBSD chat mailing list</ulink>">
 <!ENTITY a.chat.name "<ulink url='&a.chat.url;'>freebsd-chat</ulink>">
 
 <!ENTITY a.cluster.url "&a.mailman.listinfo;/freebsd-cluster">
-<!ENTITY a.cluster "<ulink url='&a.mailman.listinfo;/freebsd-cluster'>FreeBSD clustering mailing list</ulink>">
+<!ENTITY a.cluster "<ulink url='&a.cluster.url;'>FreeBSD clustering mailing list</ulink>">
 <!ENTITY a.cluster.name "<ulink url='&a.cluster.url;'>freebsd-cluster</ulink>">
 
-<!ENTITY a.committers.url "&a.mailman.listinfo;/freebsd-committers">
-<!ENTITY a.committers "<ulink url='&a.mailman.listinfo;/cvs-committers'>FreeBSD committer's mailing list</ulink>">
-<!ENTITY a.committers.name "<ulink url='&a.committers.url;'>freebsd-committers</ulink>">
+<!ENTITY a.committers "FreeBSD committer's mailing list">
+<!ENTITY a.committers.name "cvs-committers">
 
 <!ENTITY a.config.url "&a.mailman.listinfo;/freebsd-config">
-<!ENTITY a.config "<ulink url='&a.mailman.listinfo;/freebsd-config'>FreeBSD installation and configuration tools mailing list</ulink>">
+<!ENTITY a.config "<ulink url='&a.config.url;'>FreeBSD installation and configuration tools mailing list</ulink>">
 <!ENTITY a.config.name "<ulink url='&a.config.url;'>freebsd-config</ulink>">
 
-<!ENTITY a.core.url "&a.mailman.listinfo;/freebsd-core">
-<!ENTITY a.core "<ulink url='&a.mailman.listinfo;/freebsd-core'>FreeBSD core team</ulink>">
-<!ENTITY a.core.name "<ulink url='&a.core.url;'>freebsd-core</ulink>">
+<!ENTITY a.core "FreeBSD core team">
+<!ENTITY a.core.name "freebsd-core">
 
 <!ENTITY a.current.url "&a.mailman.listinfo;/freebsd-current">
-<!ENTITY a.current "<ulink url='&a.mailman.listinfo;/freebsd-current'>FreeBSD-CURRENT mailing list</ulink>">
+<!ENTITY a.current "<ulink url='&a.current.url;'>&os.current; mailing list</ulink>">
 <!ENTITY a.current.name "<ulink url='&a.current.url;'>freebsd-current</ulink>">
 
-<!ENTITY a.cvsall.url "&a.mailman.listinfo;/freebsd-cvsall">
-<!ENTITY a.cvsall "<ulink url='&a.mailman.listinfo;/cvs-all'>FreeBSD CVS commit message mailing list</ulink>">
-<!ENTITY a.cvsall.name "<ulink url='&a.cvsall.url;'>freebsd-cvsall</ulink>">
+<!ENTITY a.cvsall.url "&a.mailman.listinfo;/cvs-all">
+<!ENTITY a.cvsall "<ulink url='&a.cvsall.url;'>FreeBSD CVS commit message mailing list</ulink>">
+<!ENTITY a.cvsall.name "<ulink url='&a.cvsall.url;'>cvs-all</ulink>">
 
-<!ENTITY a.cvs-doc.url "&a.mailman.listinfo;/freebsd-cvs-doc">
-<!ENTITY a.cvs-doc "<ulink url='&a.mailman.listinfo;/cvs-doc'>FreeBSD CVS doc commit list</ulink>">
-<!ENTITY a.cvs-doc.name "<ulink url='&a.cvs-doc.url;'>freebsd-cvs-doc</ulink>">
+<!ENTITY a.cvs-doc.url "&a.mailman.listinfo;/cvs-doc">
+<!ENTITY a.cvs-doc "<ulink url='&a.cvs-doc.url;'>FreeBSD CVS doc commit list</ulink>">
+<!ENTITY a.cvs-doc.name "<ulink url='&a.cvs-doc.url;'>cvs-doc</ulink>">
 
-<!ENTITY a.cvs-ports.url "&a.mailman.listinfo;/freebsd-cvs-ports">
-<!ENTITY a.cvs-ports "<ulink url='&a.mailman.listinfo;/cvs-ports'>FreeBSD CVS ports commit list</ulink>">
-<!ENTITY a.cvs-ports.name "<ulink url='&a.cvs-ports.url;'>freebsd-cvs-ports</ulink>">
+<!ENTITY a.cvs-ports.url "&a.mailman.listinfo;/cvs-ports">
+<!ENTITY a.cvs-ports "<ulink url='&a.cvs-ports.url;'>FreeBSD CVS ports commit list</ulink>">
+<!ENTITY a.cvs-ports.name "<ulink url='&a.cvs-ports.url;'>cvs-ports</ulink>">
 
-<!ENTITY a.cvs-projects.url "&a.mailman.listinfo;/freebsd-cvs-projects">
-<!ENTITY a.cvs-projects "<ulink url='&a.mailman.listinfo;/cvs-projects'>FreeBSD CVS projects commit list</ulink>">
-<!ENTITY a.cvs-projects.name "<ulink url='&a.cvs-projects.url;'>freebsd-cvs-projects</ulink>">
+<!ENTITY a.cvs-projects.url "&a.mailman.listinfo;/cvs-projects">
+<!ENTITY a.cvs-projects "<ulink url='&a.cvs-projects.url;'>FreeBSD CVS projects commit list</ulink>">
+<!ENTITY a.cvs-projects.name "<ulink url='&a.cvs-projects.url;'>cvs-projects</ulink>">
 
-<!ENTITY a.cvs-src.url "&a.mailman.listinfo;/freebsd-cvs-src">
-<!ENTITY a.cvs-src "<ulink url='&a.mailman.listinfo;/cvs-src'>FreeBSD CVS src commit list</ulink>">
-<!ENTITY a.cvs-src.name "<ulink url='&a.cvs-src.url;'>freebsd-cvs-src</ulink>">
+<!ENTITY a.cvs-src.url "&a.mailman.listinfo;/cvs-src">
+<!ENTITY a.cvs-src "<ulink url='&a.cvs-src.url;'>FreeBSD CVS src commit list</ulink>">
+<!ENTITY a.cvs-src.name "<ulink url='&a.cvs-src.url;'>cvs-src</ulink>">
 
 <!ENTITY a.cvsweb.url "&a.mailman.listinfo;/freebsd-cvsweb">
-<!ENTITY a.cvsweb "<ulink url='&a.mailman.listinfo;/freebsd-cvsweb'>FreeBSD CVS Web maintenance mailing list</ulink>">
+<!ENTITY a.cvsweb "<ulink url='&a.cvsweb.url;'>FreeBSD CVSweb maintenance mailing list</ulink>">
 <!ENTITY a.cvsweb.name "<ulink url='&a.cvsweb.url;'>freebsd-cvsweb</ulink>">
 
 <!ENTITY a.database.url "&a.mailman.listinfo;/freebsd-database">
-<!ENTITY a.database "<ulink url='&a.mailman.listinfo;/freebsd-database'>FreeBSD based Databases mailing list</ulink>">
+<!ENTITY a.database "<ulink url='&a.database.url;'>FreeBSD based Databases mailing list</ulink>">
 <!ENTITY a.database.name "<ulink url='&a.database.url;'>freebsd-database</ulink>">
 
-<!ENTITY a.developers.url "&a.mailman.listinfo;/freebsd-developers">
-<!ENTITY a.developers "<ulink url='&a.mailman.listinfo;/freebsd-developers'>FreeBSD developers mailing list</ulink>">
-<!ENTITY a.developers.name "<ulink url='&a.developers.url;'>freebsd-developers</ulink>">
+<!ENTITY a.developers "FreeBSD developers mailing list">
+<!ENTITY a.developers.name "freebsd-developers">
 
 <!ENTITY a.doc.url "&a.mailman.listinfo;/freebsd-doc">
-<!ENTITY a.doc "<ulink url='&a.mailman.listinfo;/freebsd-doc'>FreeBSD documentation project mailing list</ulink>">
+<!ENTITY a.doc "<ulink url='&a.doc.url;'>FreeBSD documentation project mailing list</ulink>">
 <!ENTITY a.doc.name "<ulink url='&a.doc.url;'>freebsd-doc</ulink>">
 
-<!ENTITY a.doc-committers.url "&a.mailman.listinfo;/freebsd-doc-committers">
-<!ENTITY a.doc-committers "<ulink url='&a.mailman.listinfo;/doc-committers'>FreeBSD doc/ committer's mailing list</ulink>">
-<!ENTITY a.doc-committers.name "<ulink url='&a.doc-committers.url;'>freebsd-doc-committers</ulink>">
+<!ENTITY a.doc-committers "FreeBSD doc/ committer's mailing list">
+<!ENTITY a.doc-committers.name "doc-committers">
 
 <!ENTITY a.emulation.url "&a.mailman.listinfo;/freebsd-emulation">
-<!ENTITY a.emulation "<ulink url='&a.mailman.listinfo;/freebsd-emulation'>FreeBSD-emulation mailing list</ulink>">
+<!ENTITY a.emulation "<ulink url='&a.emulation.url;'>FreeBSD-emulation mailing list</ulink>">
 <!ENTITY a.emulation.name "<ulink url='&a.emulation.url;'>freebsd-emulation</ulink>">
 
 <!ENTITY a.firewire.url "&a.mailman.listinfo;/freebsd-firewire">
-<!ENTITY a.firewire "<ulink url='&a.mailman.listinfo;/freebsd-firewire'>FreeBSD FireWire (IEEE 1394) discussion mailing list</ulink>">
+<!ENTITY a.firewire "<ulink url='&a.firewire.url;'>FreeBSD FireWire (IEEE 1394) discussion mailing list</ulink>">
 <!ENTITY a.firewire.name "<ulink url='&a.firewire.url;'>freebsd-firewire</ulink>">
 
 <!ENTITY a.fs.url "&a.mailman.listinfo;/freebsd-fs">
-<!ENTITY a.fs "<ulink url='&a.mailman.listinfo;/freebsd-fs'>FreeBSD filesystem project mailing list</ulink>">
+<!ENTITY a.fs "<ulink url='&a.fs.url;'>FreeBSD file system project mailing list</ulink>">
 <!ENTITY a.fs.name "<ulink url='&a.fs.url;'>freebsd-fs</ulink>">
 
 <!ENTITY a.gnome.url "&a.mailman.listinfo;/freebsd-gnome">
-<!ENTITY a.gnome "<ulink url='&a.mailman.listinfo;/freebsd-gnome'>FreeBSD GNOME and GNOME applications mailing list</ulink>">
+<!ENTITY a.gnome "<ulink url='&a.gnome.url;'>FreeBSD GNOME and GNOME applications mailing list</ulink>">
 <!ENTITY a.gnome.name "<ulink url='&a.gnome.url;'>freebsd-gnome</ulink>">
 
 <!ENTITY a.hackers.url "&a.mailman.listinfo;/freebsd-hackers">
-<!ENTITY a.hackers "<ulink url='&a.mailman.listinfo;/freebsd-hackers'>FreeBSD technical discussions mailing list</ulink>">
+<!ENTITY a.hackers "<ulink url='&a.hackers.url;'>FreeBSD technical discussions mailing list</ulink>">
 <!ENTITY a.hackers.name "<ulink url='&a.hackers.url;'>freebsd-hackers</ulink>">
 
 <!ENTITY a.hardware.url "&a.mailman.listinfo;/freebsd-hardware">
-<!ENTITY a.hardware "<ulink url='&a.mailman.listinfo;/freebsd-hardware'>FreeBSD hardware and equipment mailing list</ulink>">
+<!ENTITY a.hardware "<ulink url='&a.hardware.url;'>FreeBSD hardware and equipment mailing list</ulink>">
 <!ENTITY a.hardware.name "<ulink url='&a.hardware.url;'>freebsd-hardware</ulink>">
 
 <!ENTITY a.hubs.url "&a.mailman.listinfo;/freebsd-hubs">
-<!ENTITY a.hubs "<ulink url='&a.mailman.listinfo;/freebsd-hub'>FreeBSD mirror sites mailing lists</ulink>">
+<!ENTITY a.hubs "<ulink url='&a.hubs.url;'>FreeBSD mirror sites mailing lists</ulink>">
 <!ENTITY a.hubs.name "<ulink url='&a.hubs.url;'>freebsd-hubs</ulink>">
 
 <!ENTITY a.i18n.url "&a.mailman.listinfo;/freebsd-i18n">
-<!ENTITY a.i18n "<ulink url='&a.mailman.listinfo;/freebsd-i18n'>FreeBSD internationalization mailing list</ulink>">
+<!ENTITY a.i18n "<ulink url='&a.i18n.url;'>FreeBSD internationalization mailing list</ulink>">
 <!ENTITY a.i18n.name "<ulink url='&a.i18n.url;'>freebsd-i18n</ulink>">
 
+<!ENTITY a.i386.url "&a.mailman.listinfo;/freebsd-i386">
+<!ENTITY a.i386 "<ulink url='&a.i386.url;'>FreeBSD i386-specific issues mailing list</ulink>">
+<!ENTITY a.i386.name "<ulink url='&a.i386.url;'>freebsd-i386</ulink>">
+
 <!ENTITY a.ia32.url "&a.mailman.listinfo;/freebsd-ia32">
-<!ENTITY a.ia32 "<ulink url='&a.mailman.listinfo;/freebsd-ia32'>FreeBSD IA32 porting mailing list</ulink>">
+<!ENTITY a.ia32 "<ulink url='&a.ia32.url;'>FreeBSD IA32 porting mailing list</ulink>">
 <!ENTITY a.ia32.name "<ulink url='&a.ia32.url;'>freebsd-ia32</ulink>">
 
 <!ENTITY a.ia64.url "&a.mailman.listinfo;/freebsd-ia64">
-<!ENTITY a.ia64 "<ulink url='&a.mailman.listinfo;/freebsd-ia64'>FreeBSD IA64 porting mailing list</ulink>">
+<!ENTITY a.ia64 "<ulink url='&a.ia64.url;'>FreeBSD IA64 porting mailing list</ulink>">
 <!ENTITY a.ia64.name "<ulink url='&a.ia64.url;'>freebsd-ia64</ulink>">
 
-<!ENTITY a.install.url "&a.mailman.listinfo;/freebsd-install">
-<!ENTITY a.install "<ulink url='&a.mailman.listinfo;/freebsd-install'>FreeBSD installation development mailing list</ulink>">
-<!ENTITY a.install.name "<ulink url='&a.install.url;'>freebsd-install</ulink>">
-
 <!ENTITY a.ipfw.url "&a.mailman.listinfo;/freebsd-ipfw">
-<!ENTITY a.ipfw "<ulink url='&a.mailman.listinfo;/freebsd-ipfw'>FreeBSD IPFW code mailing list</ulink>">
+<!ENTITY a.ipfw "<ulink url='&a.ipfw.url;'>FreeBSD IPFW code mailing list</ulink>">
 <!ENTITY a.ipfw.name "<ulink url='&a.ipfw.url;'>freebsd-ipfw</ulink>">
 
 <!ENTITY a.isdn.url "&a.mailman.listinfo;/freebsd-isdn">
-<!ENTITY a.isdn "<ulink url='&a.mailman.listinfo;/freebsd-isdn'>FreeBSD ISDN mailing list</ulink>">
+<!ENTITY a.isdn "<ulink url='&a.isdn.url;'>FreeBSD ISDN mailing list</ulink>">
 <!ENTITY a.isdn.name "<ulink url='&a.isdn.url;'>freebsd-isdn</ulink>">
 
 <!ENTITY a.isp.url "&a.mailman.listinfo;/freebsd-isp">
-<!ENTITY a.isp "<ulink url='&a.mailman.listinfo;/freebsd-isp'>FreeBSD Internet service provider's mailing list</ulink>">
+<!ENTITY a.isp "<ulink url='&a.isp.url;'>FreeBSD Internet service provider's mailing list</ulink>">
 <!ENTITY a.isp.name "<ulink url='&a.isp.url;'>freebsd-isp</ulink>">
 
 <!ENTITY a.java.url "&a.mailman.listinfo;/freebsd-java">
-<!ENTITY a.java "<ulink url='&a.mailman.listinfo;/freebsd-java'>FreeBSD Java Language mailing list</ulink>">
+<!ENTITY a.java "<ulink url='&a.java.url;'>FreeBSD Java Language mailing list</ulink>">
 <!ENTITY a.java.name "<ulink url='&a.java.url;'>freebsd-java</ulink>">
 
 <!ENTITY a.jobs.url "&a.mailman.listinfo;/freebsd-jobs">
-<!ENTITY a.jobs "<ulink url='&a.mailman.listinfo;/freebsd-jobs'>FreeBSD related employment mailing list</ulink>">
+<!ENTITY a.jobs "<ulink url='&a.jobs.url;'>FreeBSD related employment mailing list</ulink>">
 <!ENTITY a.jobs.name "<ulink url='&a.jobs.url;'>freebsd-jobs</ulink>">
 
 <!ENTITY a.kde.url "http://lists.csociety.org/listinfo/kde-freebsd">
-<!ENTITY a.kde "<ulink url='http://lists.csociety.org/listinfo/kde-freebsd'>FreeBSD KDE/Qt and KDE applications mailing list</ulink>">
+<!ENTITY a.kde "<ulink url='&a.kde.url;'>FreeBSD KDE/Qt and KDE applications mailing list</ulink>">
 <!ENTITY a.kde.name "<ulink url='&a.kde.url;'>freebsd-kde</ulink>">
 
 <!ENTITY a.lfs.url "&a.mailman.listinfo;/freebsd-lfs">
-<!ENTITY a.lfs "<ulink url='&a.mailman.listinfo;/freebsd-lfs'>FreeBSD LFS porting mailing list</ulink>">
+<!ENTITY a.lfs "<ulink url='&a.lfs.url;'>FreeBSD LFS porting mailing list</ulink>">
 <!ENTITY a.lfs.name "<ulink url='&a.lfs.url;'>freebsd-lfs</ulink>">
 
 <!ENTITY a.libh.url "&a.mailman.listinfo;/freebsd-libh">
-<!ENTITY a.libh "<ulink url='&a.mailman.listinfo;/freebsd-libh'>FreeBSD libh installation and packaging system mailing list</ulink>">
+<!ENTITY a.libh "<ulink url='&a.libh.url;'>FreeBSD libh installation and packaging system mailing list</ulink>">
 <!ENTITY a.libh.name "<ulink url='&a.libh.url;'>freebsd-libh</ulink>">
 
 <!ENTITY a.mips.url "&a.mailman.listinfo;/freebsd-mips">
-<!ENTITY a.mips "<ulink url='&a.mailman.listinfo;/freebsd-mips'>FreeBSD MIPS porting mailing list</ulink>">
+<!ENTITY a.mips "<ulink url='&a.mips.url;'>FreeBSD MIPS porting mailing list</ulink>">
 <!ENTITY a.mips.name "<ulink url='&a.mips.url;'>freebsd-mips</ulink>">
 
 <!ENTITY a.mobile.url "&a.mailman.listinfo;/freebsd-mobile">
-<!ENTITY a.mobile "<ulink url='&a.mailman.listinfo;/freebsd-mobile'>FreeBSD laptop computer mailing list</ulink>">
+<!ENTITY a.mobile "<ulink url='&a.mobile.url;'>FreeBSD laptop computer mailing list</ulink>">
 <!ENTITY a.mobile.name "<ulink url='&a.mobile.url;'>freebsd-mobile</ulink>">
 
 <!ENTITY a.mozilla.url "&a.mailman.listinfo;/freebsd-mozilla">
-<!ENTITY a.mozilla "<ulink url='&a.mailman.listinfo;/freebsd-mozilla'>FreeBSD port of the Mozilla browser mailing list</ulink>">
+<!ENTITY a.mozilla "<ulink url='&a.mozilla.url;'>FreeBSD port of the Mozilla browser mailing list</ulink>">
 <!ENTITY a.mozilla.name "<ulink url='&a.mozilla.url;'>freebsd-mozilla</ulink>">
 
 <!ENTITY a.multimedia.url "&a.mailman.listinfo;/freebsd-multimedia">
-<!ENTITY a.multimedia "<ulink url='&a.mailman.listinfo;/freebsd-multimedia'>FreeBSD multimedia mailing list</ulink>">
+<!ENTITY a.multimedia "<ulink url='&a.multimedia.url;'>FreeBSD multimedia mailing list</ulink>">
 <!ENTITY a.multimedia.name "<ulink url='&a.multimedia.url;'>freebsd-multimedia</ulink>">
 
 <!ENTITY a.net.url "&a.mailman.listinfo;/freebsd-net">
-<!ENTITY a.net "<ulink url='&a.mailman.listinfo;/freebsd-net'>FreeBSD networking mailing list</ulink>">
+<!ENTITY a.net "<ulink url='&a.net.url;'>FreeBSD networking mailing list</ulink>">
 <!ENTITY a.net.name "<ulink url='&a.net.url;'>freebsd-net</ulink>">
 
 <!ENTITY a.newbies.url "&a.mailman.listinfo;/freebsd-newbies">
-<!ENTITY a.newbies "<ulink url='&a.mailman.listinfo;/freebsd-newbies'>FreeBSD new users mailing list</ulink>">
+<!ENTITY a.newbies "<ulink url='&a.newbies.url;'>FreeBSD new users mailing list</ulink>">
 <!ENTITY a.newbies.name "<ulink url='&a.newbies.url;'>freebsd-newbies</ulink>">
 
 <!ENTITY a.newbus.url "&a.mailman.listinfo;/freebsd-new-bus">
-<!ENTITY a.newbus "<ulink url='&a.mailman.listinfo;/freebsd-new-bus'>FreeBSD new-bus mailing list</ulink>">
-<!ENTITY a.newbus.name "<ulink url='&a.newbus.url;'>freebsd-newbus</ulink>">
+<!ENTITY a.newbus "<ulink url='&a.newbus.url;'>FreeBSD new-bus mailing list</ulink>">
+<!ENTITY a.newbus.name "<ulink url='&a.newbus.url;'>freebsd-new-bus</ulink>">
 
 <!ENTITY a.openoffice.url "&a.mailman.listinfo;/freebsd-openoffice">
-<!ENTITY a.openoffice "<ulink url='&a.mailman.listinfo;/freebsd-openoffice'>FreeBSD OpenOffice mailing list</ulink>">
+<!ENTITY a.openoffice "<ulink url='&a.openoffice.url;'>FreeBSD OpenOffice mailing list</ulink>">
 <!ENTITY a.openoffice.name "<ulink url='&a.openoffice.url;'>freebsd-openoffice</ulink>">
 
 <!ENTITY a.performance.url "&a.mailman.listinfo;/freebsd-performance">
-<!ENTITY a.performance "<ulink url='&a.mailman.listinfo;/freebsd-performance'>FreeBSD performance mailing list</ulink>">
+<!ENTITY a.performance "<ulink url='&a.performance.url;'>FreeBSD performance mailing list</ulink>">
 <!ENTITY a.performance.name "<ulink url='&a.performance.url;'>freebsd-performance</ulink>">
 
 <!ENTITY a.platforms.url "&a.mailman.listinfo;/freebsd-platforms">
-<!ENTITY a.platforms "<ulink url='&a.mailman.listinfo;/freebsd-platforms'>FreeBSD non-Intel platforms porting mailing list</ulink>">
+<!ENTITY a.platforms "<ulink url='&a.platforms.url;'>FreeBSD non-Intel platforms porting mailing list</ulink>">
 <!ENTITY a.platforms.name "<ulink url='&a.platforms.url;'>freebsd-platforms</ulink>">
 
 <!ENTITY a.policy.url "&a.mailman.listinfo;/freebsd-policy">
-<!ENTITY a.policy "<ulink url='&a.mailman.listinfo;/freebsd-policy'>FreeBSD core team policy decisions mailing list</ulink>">
+<!ENTITY a.policy "<ulink url='&a.policy.url;'>FreeBSD core team policy decisions mailing list</ulink>">
 <!ENTITY a.policy.name "<ulink url='&a.policy.url;'>freebsd-policy</ulink>">
 
 <!ENTITY a.ports.url "&a.mailman.listinfo;/freebsd-ports">
-<!ENTITY a.ports "<ulink url='&a.mailman.listinfo;/freebsd-ports'>FreeBSD ports mailing list</ulink>">
+<!ENTITY a.ports "<ulink url='&a.ports.url;'>FreeBSD ports mailing list</ulink>">
 <!ENTITY a.ports.name "<ulink url='&a.ports.url;'>freebsd-ports</ulink>">
 
 <!ENTITY a.ports-bugs.url "&a.mailman.listinfo;/freebsd-ports-bugs">
-<!ENTITY a.ports-bugs "<ulink url='&a.mailman.listinfo;/freebsd-ports-bugs'>FreeBSD ports bugs mailing list</ulink>">
+<!ENTITY a.ports-bugs "<ulink url='&a.ports-bugs.url;'>FreeBSD ports bugs mailing list</ulink>">
 <!ENTITY a.ports-bugs.name "<ulink url='&a.ports-bugs.url;'>freebsd-ports-bugs</ulink>">
 
-<!ENTITY a.ports-committers.url "&a.mailman.listinfo;/freebsd-ports-committers">
-<!ENTITY a.ports-committers "<ulink url='&a.mailman.listinfo;/ports-committers'>FreeBSD ports/ committer's mailing list</ulink>">
-<!ENTITY a.ports-committers.name "<ulink url='&a.ports-committers.url;'>freebsd-ports-committers</ulink>">
+<!ENTITY a.ports-committers "FreeBSD ports/ committer's mailing list">
+<!ENTITY a.ports-committers.name "ports-committers">
 
 <!ENTITY a.ppc.url "&a.mailman.listinfo;/freebsd-ppc">
-<!ENTITY a.ppc "<ulink url='&a.mailman.listinfo;/freebsd-ppc'>FreeBSD PowerPC porting mailing list</ulink>">
+<!ENTITY a.ppc "<ulink url='&a.ppc.url;'>FreeBSD PowerPC porting mailing list</ulink>">
 <!ENTITY a.ppc.name "<ulink url='&a.ppc.url;'>freebsd-ppc</ulink>">
 
 <!ENTITY a.qa.url "&a.mailman.listinfo;/freebsd-qa">
-<!ENTITY a.qa "<ulink url='&a.mailman.listinfo;/freebsd-qa'>FreeBSD Quality Assurance mailing list</ulink>">
+<!ENTITY a.qa "<ulink url='&a.qa.url;'>FreeBSD Quality Assurance mailing list</ulink>">
 <!ENTITY a.qa.name "<ulink url='&a.qa.url;'>freebsd-qa</ulink>">
 
 <!ENTITY a.questions.url "&a.mailman.listinfo;/freebsd-questions">
-<!ENTITY a.questions "<ulink url='&a.mailman.listinfo;/freebsd-questions'>FreeBSD general questions mailing list</ulink>">
+<!ENTITY a.questions "<ulink url='&a.questions.url;'>FreeBSD general questions mailing list</ulink>">
 <!ENTITY a.questions.name "<ulink url='&a.questions.url;'>freebsd-questions</ulink>">
 
 <!ENTITY a.realtime.url "&a.mailman.listinfo;/freebsd-realtime">
-<!ENTITY a.realtime "<ulink url='&a.mailman.listinfo;/freebsd-realtime'>FreeBSD realtime extensions mailing list</ulink>">
+<!ENTITY a.realtime "<ulink url='&a.realtime.url;'>FreeBSD realtime extensions mailing list</ulink>">
 <!ENTITY a.realtime.name "<ulink url='&a.realtime.url;'>freebsd-realtime</ulink>">
 
 <!ENTITY a.scsi.url "&a.mailman.listinfo;/freebsd-scsi">
-<!ENTITY a.scsi "<ulink url='&a.mailman.listinfo;/freebsd-scsi'>FreeBSD SCSI subsystem mailing list</ulink>">
+<!ENTITY a.scsi "<ulink url='&a.scsi.url;'>FreeBSD SCSI subsystem mailing list</ulink>">
 <!ENTITY a.scsi.name "<ulink url='&a.scsi.url;'>freebsd-scsi</ulink>">
 
 <!ENTITY a.security.url "&a.mailman.listinfo;/freebsd-security">
-<!ENTITY a.security "<ulink url='&a.mailman.listinfo;/freebsd-security'>FreeBSD security mailing list</ulink>">
+<!ENTITY a.security "<ulink url='&a.security.url;'>FreeBSD security mailing list</ulink>">
 <!ENTITY a.security.name "<ulink url='&a.security.url;'>freebsd-security</ulink>">
 
 <!ENTITY a.security-notifications.url "&a.mailman.listinfo;/freebsd-security-notifications">
-<!ENTITY a.security-notifications "<ulink url='&a.mailman.listinfo;/freebsd-security-notifications'>FreeBSD security notifications mailing list</ulink>">
+<!ENTITY a.security-notifications "<ulink url='&a.security-notifications.url;'>FreeBSD security notifications mailing list</ulink>">
 <!ENTITY a.security-notifications.name "<ulink url='&a.security-notifications.url;'>freebsd-security-notifications</ulink>">
 
 <!ENTITY a.small.url "&a.mailman.listinfo;/freebsd-small">
-<!ENTITY a.small "<ulink url='&a.mailman.listinfo;/freebsd-small'>FreeBSD-small mailing list</ulink>">
+<!ENTITY a.small "<ulink url='&a.small.url;'>FreeBSD-small mailing list</ulink>">
 <!ENTITY a.small.name "<ulink url='&a.small.url;'>freebsd-small</ulink>">
 
 <!ENTITY a.smp.url "&a.mailman.listinfo;/freebsd-smp">
-<!ENTITY a.smp "<ulink url='&a.mailman.listinfo;/freebsd-smp'>FreeBSD symmetric multiprocessing mailing list</ulink>">
+<!ENTITY a.smp "<ulink url='&a.smp.url;'>FreeBSD symmetric multiprocessing mailing list</ulink>">
 <!ENTITY a.smp.name "<ulink url='&a.smp.url;'>freebsd-smp</ulink>">
 
-<!ENTITY a.sparc.url "&a.mailman.listinfo;/freebsd-sparc">
-<!ENTITY a.sparc "<ulink url='&a.mailman.listinfo;/freebsd-sparc'>FreeBSD SPARC porting mailing list</ulink>">
-<!ENTITY a.sparc.name "<ulink url='&a.sparc.url;'>freebsd-sparc</ulink>">
+<!ENTITY a.sparc.url "&a.mailman.listinfo;/freebsd-sparc64">
+<!ENTITY a.sparc "<ulink url='&a.sparc.url;'>FreeBSD SPARC porting mailing list</ulink>">
+<!ENTITY a.sparc.name "<ulink url='&a.sparc.url;'>freebsd-sparc64</ulink>">
 
-<!ENTITY a.src-committers.url "&a.mailman.listinfo;/freebsd-src-comitters">
-<!ENTITY a.src-committers "<ulink url='&a.mailman.listinfo;/src-committers'>FreeBSD src/ committer's mailing list</ulink>">
-<!ENTITY a.src-committers.name "<ulink url='&a.src-committers.url;'>freebsd-src-committers</ulink>">
+<!ENTITY a.src-committers "FreeBSD src/ committer's mailing list">
+<!ENTITY a.src-committers.name "freebsd-src-committers">
 
 <!ENTITY a.stable.url "&a.mailman.listinfo;/freebsd-stable">
-<!ENTITY a.stable "<ulink url='&a.mailman.listinfo;/freebsd-stable'>FreeBSD-STABLE mailing list</ulink>">
+<!ENTITY a.stable "<ulink url='&a.stable.url;'>&os.stable; mailing</ulink>">
 <!ENTITY a.stable.name "<ulink url='&a.stable.url;'>freebsd-stable</ulink>">
 
 <!ENTITY a.standards.url "&a.mailman.listinfo;/freebsd-standards">
-<!ENTITY a.standards "<ulink url='&a.mailman.listinfo;/freebsd-standards'>FreeBSD C99 and POSIX compliance mailing list</ulink>">
+<!ENTITY a.standards "<ulink url='&a.standards.url;'>FreeBSD C99 and POSIX compliance mailing list</ulink>">
 <!ENTITY a.standards.name "<ulink url='&a.standards.url;'>freebsd-standards</ulink>">
 
 <!ENTITY a.test.url "&a.mailman.listinfo;/freebsd-test">
-<!ENTITY a.test "<ulink url='&a.mailman.listinfo;/freebsd-test'>FreeBSD test mailing list</ulink>">
+<!ENTITY a.test "<ulink url='&a.test.url;'>FreeBSD test mailing list</ulink>">
 <!ENTITY a.test.name "<ulink url='&a.test.url;'>freebsd-test</ulink>">
 
 <!ENTITY a.testing.url "&a.mailman.listinfo;/freebsd-testing">
-<!ENTITY a.testing "<ulink url='&a.mailman.listinfo;/freebsd-testing'>FreeBSD performance and stability testing mailing list</ulink>">
+<!ENTITY a.testing "<ulink url='&a.testing.url;'>FreeBSD performance and stability testing mailing list</ulink>">
 <!ENTITY a.testing.name "<ulink url='&a.testing.url;'>freebsd-testing</ulink>">
 
 <!ENTITY a.threads.url "&a.mailman.listinfo;/freebsd-threads">
-<!ENTITY a.threads "<ulink url='&a.mailman.listinfo;/freebsd-threads'>FreeBSD threads mailing list</ulink>">
+<!ENTITY a.threads "<ulink url='&a.threads.url;'>FreeBSD threads mailing list</ulink>">
 <!ENTITY a.threads.name "<ulink url='&a.threads.url;'>freebsd-threads</ulink>">
 
 <!ENTITY a.tokenring.url "&a.mailman.listinfo;/freebsd-tokenring">
-<!ENTITY a.tokenring "<ulink url='&a.mailman.listinfo;/freebsd-tokenring'>FreeBSD tokenring mailing list</ulink>">
+<!ENTITY a.tokenring "<ulink url='&a.tokenring.url;'>FreeBSD tokenring mailing list</ulink>">
 <!ENTITY a.tokenring.name "<ulink url='&a.tokenring.url;'>freebsd-tokenring</ulink>">
 
 <!ENTITY a.usergroups.url "&a.mailman.listinfo;/freebsd-user-groups">
-<!ENTITY a.usergroups "<ulink url='&a.mailman.listinfo;/freebsd-user-groups'>FreeBSD user group coordination mailing list</ulink>">
+<!ENTITY a.usergroups "<ulink url='&a.usergroups.url;'>FreeBSD user group coordination mailing list</ulink>">
 <!ENTITY a.usergroups.name "<ulink url='&a.usergroups.url;'>freebsd-user-groups</ulink>">
 
 <!ENTITY a.vendors.url "&a.mailman.listinfo;/freebsd-vendors">
-<!ENTITY a.vendors "<ulink url='&a.mailman.listinfo;/freebsd-vendors'>FreeBSD vendors pre-release coordination mailing list</ulink>">
+<!ENTITY a.vendors "<ulink url='&a.vendors.url;'>FreeBSD vendors pre-release coordination mailing list</ulink>">
 <!ENTITY a.vendors.name "<ulink url='&a.vendors.url;'>freebsd-vendors</ulink>">
 
 <!ENTITY a.www.url "&a.mailman.listinfo;/freebsd-www">
-<!ENTITY a.www "<ulink url='&a.mailman.listinfo;/freebsd-www'>FreeBSD Webmaster mailing list</ulink>">
+<!ENTITY a.www "<ulink url='&a.www.url;'>FreeBSD Webmaster mailing list</ulink>">
 <!ENTITY a.www.name "<ulink url='&a.www.url;'>freebsd-www</ulink>">
 
 <!ENTITY a.majordomo "<email>majordomo@FreeBSD.org</email>">