diff --git a/en/hats.ent b/en/hats.ent
index 4651781f96..cab0bad917 100644
--- a/en/hats.ent
+++ b/en/hats.ent
@@ -1,84 +1,84 @@
 <!-- 
 
 This document provides entities for developer hats.  Note that we
 use a different format from that in developers.ent which uses the
 a.name setup.  Here we use b.  Having one file for this we can
 bring hat listings throughout the website and only update this
 single file.
 
 Notice:  We are using a different character on obrien's name, this
 is due to breakage when I attempt to use one of the entity characters
 of ' or ".
 
-$FreeBSD: www/en/hats.ent,v 1.4 2003/02/11 19:14:20 trhodes Exp $
+$FreeBSD: www/en/hats.ent,v 1.5 2003/02/11 20:50:01 bmah Exp $
 
 -->
 
 <!-- FreeBSD Doc Engineering Team -->
 <!ENTITY b.doceng '&b.nik;, &b.murray;, &b.bmah;, &b.ru;, &b.kuriyama;'>
 
 <!-- FreeBSD Donations Liaison -->
 <!ENTITY b.donations '&b.mwlucas;, &b.nsayer;, &b.obrien;, &b.rwatson;, &b.trhodes;'>
 
 <!-- FreeBSD Ports Manager Team -->
 <!ENTITY b.portmgr '&b.asami;, &b.kris;, &b.sobomax;, &b.steve;, &b.will;, &b.knu;, &b.chern;, &b.lioux;'>
 
 <!-- FreeBSD Release Engineering Teams -->
 <!ENTITY b.re '&b.bmah;, &b.jhb;, &b.kris;, &b.murray;, &b.rwatson;, &b.scottl;, &b.steve;'>
 <!ENTITY b.re-alpha '&b.jhb;, &b.kris;, &b.murray;, &b.obrien;, &b.rwatson;, &b.scottl;, &b.wilko;'>
 <!ENTITY b.re-ia64 '&b.marcel;, &b.peter;'>
 <!ENTITY b.re-i386 '&b.bmah;, &b.jhb;, &b.kris;, &b.murray;, &b.rwatson;, &b.scottl;'>
 <!ENTITY b.re-pc98 '&b.nyan;'>
 <!ENTITY b.re-sparc64 '&b.jake;, &b.jhb;, &b.kris;, &b.murray;, &b.phk;, &b.rwatson;, &b.scottl;, &b.tmm;'>
 
 <!-- FreeBSD Security Officer -->
 <!ENTITY b.so '&b.nectar;'>
 
-<!ENTITY b.so-team '&b.kris;, &b.guido;, &b.wes;, &b.dannyboy;, &b.des;, &b.billf;, &b.trevor;, &b.rwatson; &imp; &jedgar;'>
+<!ENTITY b.so-team '&b.kris;, &b.guido;, &b.wes;, &b.dannyboy;, &b.des;, &b.billf;, &b.trevor;, &b.rwatson; &b.imp; &b.jedgar;'>
 
 <!-- FreeBSD Technical Review Board -->
 <!ENTITY b.trb '&b.dfr;, &b.jake;, &b.jeff;, &b.iedowse;, &b.alc;, &b.gallatin;, &b.jhb;, &b.peter;, &b.imp;, &b.sam;'>
 
 <!-- FreeBSD Hat Owners -->
 <!ENTITY b.alc '<a href="mailto:alc@FreeBSD.org">Alan Cox</a>'>
 <!ENTITY b.asami '<a href="mailto:asami@FreeBSD.org">Satoshi Asami</a>'>
 <!ENTITY b.billf '<a href="mailto:billf@FreeBSD.org">Bill Fumerola</a>'>
 <!ENTITY b.bmah '<a href="mailto:bmah@FreeBSD.org">Bruce A. Mah</a>'>
 <!ENTITY b.chern '<a href="mailto:chern@FreeBSD.org">Chern Lee</a>'>
 <!ENTITY b.dannyboy '<a href="mailto:dannyboy@FreeBSD.org">Daniel Harris</a>'>
 <!ENTITY b.des '<a href="mailto:des@FreeBSD.org">Dag-Erling Smorgrav</a>'>
 <!ENTITY b.dfr '<a href="mailto:dfr@FreeBSD.org">Doug Rabson</a>'>
 <!ENTITY b.gallatin '<a href="mailto:gallatin@FreeBSD.org">Andrew Gallatin</a>'>
 <!ENTITY b.guido '<a href="mailto:guido@FreeBSD.org">Guido van Rooij</a>'>
 <!ENTITY b.iedowse '<a href="mailto:iedowse@FreeBSD.org">Ian Dowse</a>'>
 <!ENTITY b.imp '<a href="mailto:imp@FreeBSD.org">Warner Losh</a>'>
 <!ENTITY b.jake '<a href="mailto:jake@FreeBSD.org">Jake Burkholder</a>'>
 <!ENTITY b.jeff '<a href="mailto:jeff@FreeBSD.org">Jeff Roberson</a>'>
 <!ENTITY b.jedgar '<a href="mailto:jedgar@FreeBSD.org">Chris D. Faulhaber</a>'>
 <!ENTITY b.jhb '<a href="mailto:jhb@FreeBSD.org">John Baldwin</a>'>
 <!ENTITY b.knu '<a href="mailto:knu@FreeBSD.org">Akinori MUSHA</a>'>
 <!ENTITY b.kris '<a href="mailto:kris@FreeBSD.org">Kris Kennaway</a>'>
 <!ENTITY b.kuriyama '<a href="mailto:kuriyama@FreeBSD.org">Jun Kuriyama</a>'>
 <!ENTITY b.lioux '<a href="mailto:lioux@FreeBSD.org">Mario Sergio Fujikawa Ferreira</a>'>
 <!ENTITY b.marcel '<a href="mailto:marcel@FreeBSD.org">Marcel Moolenaar</a>'>
 <!ENTITY b.murray '<a href="mailto:murray@FreeBSD.org">Murray Stokely</a>'>
 <!ENTITY b.mwlucas '<a href="mailto:mwlucas@FreeBSD.org">Michael Lucas</a>'>
 <!ENTITY b.nectar '<a href="mailto:nectar@FreeBSD.org">Jacques Vidrine</a>'>
 <!ENTITY b.nik '<a href="mailto:nik@FreeBSD.org">Nik Clayton</a>'>
 <!ENTITY b.nsayer '<a href="mailto:nsayer@FreeBSD.org">Nick Sayer</a>'>
 <!ENTITY b.nyan '<a href="mailto:nyan@FreeBSD.org">Takahashi Yoshihiro</a>'>
 <!ENTITY b.obrien '<a href="mailto:obrien@FreeBSD.org">David O`Brien</a>'>
 <!ENTITY b.peter '<a href="mailto:peter@FreeBSD.org">Peter Wemm</a>'>
 <!ENTITY b.phk '<a href="mailto:phk@FreeBSD.org">Poul-Henning Kamp</a>'>
 <!ENTITY b.ru '<a href="mailto:ru@FreeBSD.org">Ruslan Ermilov</a>'>
 <!ENTITY b.rwatson '<a href="mailto:rwatson@FreeBSD.org">Robert Watson</a>'>
 <!ENTITY b.sam '<a href="mailto:sam@FreeBSD.org">Sam Leffler</a>'>
 <!ENTITY b.scottl '<a href="mailto:scottl@FreeBSD.org">Scott Long</a>'>
 <!ENTITY b.sobomax '<a href="mailto:sobomax@FreeBSD.org">Maxim Sobolev</a>'>
 <!ENTITY b.steve '<a href="mailto:steve@FreeBSD.org">Steve Price</a>'>
 <!ENTITY b.tmm '<a href="mailto:tmm@FreeBSD.org">Thomas Moestl</a>'>
 <!ENTITY b.trevor '<a href="mailto:trevor@FreeBSD.org">Trevor Johnson</a>'>
 <!ENTITY b.trhodes '<a href="mailto:trhodes@FreeBSD.org">Tom Rhodes</a>'>
 <!ENTITY b.wes '<a href="mailto:wes@FreeBSD.org">Wes Peters</a>'>
 <!ENTITY b.will '<a href="mailto:will@FreeBSD.org">Will Andrews</a>'>
 <!ENTITY b.wilko '<a href="mailto:wilko@FreeBSD.org">Wilko Bulte</a>'>