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