diff --git a/en/developers.sgml b/en/developers.sgml
index e7525494e2..c555a9d175 100644
--- a/en/developers.sgml
+++ b/en/developers.sgml
@@ -1,102 +1,146 @@
 <!-- 
 
 This document provides entities for developers listed by name on the
 FreeBSD web site.  Keeping this information in a central location
 allows multiple documents to use the abbreviated entities, and allows
 us to update author names, or the representation of those names (such
 as adding email addresses), by just editing a single file.
 
-$FreeBSD: www/en/developers.sgml,v 1.38 2003/02/27 16:34:56 mike Exp $
+$FreeBSD: www/en/developers.sgml,v 1.39 2003/03/04 15:41:34 mux Exp $
 
 -->
 
 <!-- FreeBSD Contributers -->
 <!ENTITY a.ade "Ade Lovett">
 <!ENTITY a.ache "Andrey&nbsp;A.&nbsp;Chernov">
 <!ENTITY a.alc "Alan L. Cox">
 <!ENTITY a.alfred "Alfred Perlstein">
 <!ENTITY a.anholt "Eric Anholt">
 <!ENTITY a.archie "Archie Cobbs">
 <!ENTITY a.arr "Andrew Reiter">
 <!ENTITY a.asami "Satoshi Asami">
 <!ENTITY a.asmodai "Jeroen&nbsp;Ruigrok">
 <!ENTITY a.bde "Bruce&nbsp;Evans">
 <!ENTITY a.benno "Benno Rice">
+<!ENTITY a.billf "Bill Fumerola">
 <!ENTITY a.bmah "Bruce A. Mah">
 <!ENTITY a.bmilekic "Bosko Milekic">
 <!ENTITY a.brian "Brian Somers">
+<!ENTITY a.chern "Chern Lee">
 <!ENTITY a.chris "Chris Costello">
 <!ENTITY a.cognet "Olivier Houchard">
 <!ENTITY a.cp "Chuck Paterson">
 <!ENTITY a.das "David Schultz">
+<!ENTITY a.dannyboy "Daniel Harris">
 <!ENTITY a.davidc "Chad David">
 <!ENTITY a.dd "Dima&nbsp;Dorfman">
 <!ENTITY a.dec "David&nbsp;E.&nbsp;Cross">
 <!ENTITY a.des "Dag-Erling Smorgrav">
 <!ENTITY a.dfr "Doug Rabson">
 <!ENTITY a.dillon "Matt Dillon">
 <!ENTITY a.eivind "Eivind Eklund">
 <!ENTITY a.fenner "Bill&nbsp;Fenner">
 <!ENTITY a.gad "Garance A Drosehn">
 <!ENTITY a.gallatin "Andrew Gallatin">
 <!ENTITY a.green "Brian Feldman">
 <!ENTITY a.grehan "Peter Grehan">
 <!ENTITY a.grog "Greg Lehey">
+<!ENTITY a.guido "Guido van Rooij">
 <!ENTITY a.harti "Harti Brandt">
 <!ENTITY a.hsu "Jeffrey Hsu">
+<!ENTITY a.iedowse "Ian Dowse">
 <!ENTITY a.imp "Warner Losh">
 <!ENTITY a.jake "Jake Burkholder">
 <!ENTITY a.jasone "Jason Evans">
+<!ENTITY a.jedgar "Chris D. Faulhaber">
 <!ENTITY a.jeff "Jeff Roberson">
 <!ENTITY a.jennifer "Jennifer Yang">
 <!ENTITY a.jhb "John Baldwin">
 <!ENTITY a.jlemon "Jonathan Lemon">
 <!ENTITY a.jmallett "Juli Mallett">
 <!ENTITY a.joe "Josef Karthauser">
 <!ENTITY a.joe.halpin "Joe&nbsp;Halpin">
 <!ENTITY a.jwojdacki "Justin&nbsp;Wojdacki">
 <!ENTITY a.kan "Alexander Kabaev">
 <!ENTITY a.kbyanc "Kelly&nbsp;Yancey">
 <!ENTITY a.keichii "Michael&nbsp;C.&nbsp;Wu">
 <!ENTITY a.knu "Akinori&nbsp;MUSHA">
 <!ENTITY a.kris "Kris Kennaway">
+<!ENTITY a.kuriyama "Jun Kuriyama">
+<!ENTITY a.lioux "Mario Sergio Fujikawa Ferreira">
 <!ENTITY a.marcel "Marcel Moolenaar">
 <!ENTITY a.markm "Mark&nbsp;Murray">
 <!ENTITY a.maxim "Maxim&nbsp;Konovalov">
 <!ENTITY a.mbr "Martin Blapp">
 <!ENTITY a.mike "Mike&nbsp;Barcroft">
 <!ENTITY a.mikeh "Mike&nbsp;Heffner">
 <!ENTITY a.mini "Jonathan&nbsp;Mini">
 <!ENTITY a.mkm "Kyle&nbsp;Martin">
 <!ENTITY a.msmith "Mike Smith">
 <!ENTITY a.mtm "Mike Makonnen">
 <!ENTITY a.murray "Murray Stokely">
 <!ENTITY a.mux "Maxime Henrion">
 <!ENTITY a.mwlucas "Michael Lucas">
 <!ENTITY a.nectar "Jacques Vidrine">
+<!ENTITY a.nik "Nik Clayton">
+<!ENTITY a.nsayer "Nick Sayer">
 <!ENTITY a.nyan "Takahashi Yoshihiro">
 <!ENTITY a.obrien "David O'Brien">
 <!ENTITY a.pavalos "Peter&nbsp;Avalos">
 <!ENTITY a.pdeuskar "Prafulla Deuskar">
 <!ENTITY a.peter "Peter Wemm">
 <!ENTITY a.phantom "Alexey&nbsp;Zelkin">
 <!ENTITY a.phk "Poul-Henning Kamp">
 <!ENTITY a.re "re@FreeBSD.org">
 <!ENTITY a.robert "Robert&nbsp;Drehmel">
+<!ENTITY a.ru "Ruslan Ermilov">
 <!ENTITY a.rwatson "Robert Watson">
 <!ENTITY a.sam "Sam Leffler">
 <!ENTITY a.scop "Ville Skytt&auml;">
 <!ENTITY a.scottl "Scott&nbsp;Long">
 <!ENTITY a.sheldonh "Sheldon&nbsp;Hearn">
 <!ENTITY a.sobomax "Maxim Sobolev">
 <!ENTITY a.steve "Steve Price">
 <!ENTITY a.tanimura "Seigo Tanimura">
 <!ENTITY a.tegge "Tor Egge">
 <!ENTITY a.tjr "Tim&nbsp;J.&nbsp;Robbins">
 <!ENTITY a.tmm "Thomas Moestl">
+<!ENTITY a.trevor "Trevor Johnson">
 <!ENTITY a.trhodes "Tom Rhodes">
 <!ENTITY a.wes "Wes&nbsp;Peters">
 <!ENTITY a.wilko "Wilko Bulte">
 <!ENTITY a.will "Will Andrews">
 <!ENTITY a.wollman "Garrett&nbsp;Wollman">
 <!ENTITY a.wpaul "Bill Paul">
+
+<!-- Below we list the various hats.  This is used in internal/staff.sgml
+so that we may keep a list of hat owners and modify only this file. -->
+
+
+<!-- FreeBSD Bugmiester -->
+<!ENTITY a.bugmiester '&a.keramida;'>
+
+<!-- FreeBSD Doc Engineering Team -->
+<!ENTITY a.doceng '&a.nik;, &a.murray;, &a.bmah;, &a.ru;, &a.kuriyama;'>
+
+<!-- FreeBSD Donations Liaison -->
+<!ENTITY a.donations '&a.mwlucas;, &a.nsayer;, &a.obrien;, &a.rwatson;, &a.trhodes;'>
+
+<!-- FreeBSD Ports Manager Team -->
+<!ENTITY a.portmgr '&a.asami;, &a.kris;, &a.sobomax;, &a.steve;, &a.will;, &a.knu;, &a.chern;, &a.lioux;'>
+
+<!-- FreeBSD Release Engineering Teams -->
+<!ENTITY a.re '&a.bmah;, &a.jhb;, &a.kris;, &a.murray;, &a.rwatson;, &a.scottl;, &a.steve;'>
+<!ENTITY a.re-alpha '&a.jhb;, &a.kris;, &a.murray;, &a.obrien;, &a.rwatson;, &a.scottl;, &a.wilko;'>
+<!ENTITY a.re-ia64 '&a.marcel;, &a.peter;'>
+<!ENTITY a.re-i386 '&a.bmah;, &a.jhb;, &a.kris;, &a.murray;, &a.rwatson;, &a.scottl;'>
+<!ENTITY a.re-pc98 '&a.nyan;'>
+<!ENTITY a.re-sparc64 '&a.jake;, &a.jhb;, &a.kris;, &a.murray;, &a.phk;, &a.rwatson;, &a.scottl;, &a.tmm;'>
+
+<!-- FreeBSD Security Officer -->
+<!ENTITY a.so '&a.nectar;'>
+
+<!ENTITY a.so-team '&a.kris;, &a.guido;, &a.wes;, &a.dannyboy;, &a.des;, &a.billf;, &a.trevor;, &a.rwatson; &a.imp; &a.jedgar;'>
+
+<!-- FreeBSD Technical Review Board -->
+<!ENTITY a.trb '&a.dfr;, &a.jake;, &a.jeff;, &a.iedowse;, &a.alc;, &a.gallatin;, &a.jhb;, &a.peter;, &a.imp;, &a.sam;'>
diff --git a/en/internal/staff.sgml b/en/internal/staff.sgml
index e4588166bd..b744cbb492 100644
--- a/en/internal/staff.sgml
+++ b/en/internal/staff.sgml
@@ -1,55 +1,55 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/internal/staff.sgml,v 1.3 2003/02/13 03:56:43 trhodes Exp $">
+<!ENTITY date "$FreeBSD: www/en/internal/staff.sgml,v 1.4 2003/02/13 04:03:44 trhodes Exp $">
 <!ENTITY title "FreeBSD Staff">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!ENTITY % hats SYSTEM "../hats.ent"> %hats;
+<!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
 ]>
 <html>
   &header;
   
     <h2>FreeBSD Bugmiester:</h2>
     <p>a.bugmiester;</p>
 
     <h2>FreeBSD Documentation Engineering Team:</h2>
     <p>&a.doceng;</p>
     
     <h2>FreeBSD Donations Liaison Team:</h2>
     <p>&a.donations;</p>
     
     <h2>FreeBSD Ports Manager Team:</h2>
     <p>&a.portmgr;</p>
     
     <h2>FreeBSD Release Engineering Team:</h2>
     <p>&a.re;</p>
     
     <h2>FreeBSD Release Engineering for Alpha Team:</h2>
     <p>&a.re-alpha;</p>
     
     <h2>FreeBSD Release Engineering for IA-64 Team:</h2>
     <p>&a.re-ia64;</p>
     
     <h2>FreeBSD Release Engineering for i386 Team:</h2>
     <p>&a.re-i386;</p>
     
     <h2>FreeBSD Release Engineering for PC98 Team:</h2>
     <p>&a.re-pc98;</p>
     
     <h2>FreeBSD Release Engineering for Sparc64 Team:</h2>
     <p>&a.re-sparc64;</p>
     
     <h2>FreeBSD Security Officers:</h2>
     <p>&a.so;</p>
     
     <h2>FreeBSD Security Officer Team:</h2>
     <p>&a.so-team;</p>
     
     <h2>FreeBSD Technical Review Board:</h2>
     <p>&a.trb;</p>
 
 
   &footer;
   </body>
 </html>