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