diff --git a/en/developers.sgml b/en/developers.sgml
index cbcbcfe94c..47fc199613 100644
--- a/en/developers.sgml
+++ b/en/developers.sgml
@@ -1,558 +1,558 @@
 <!--
 
 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.142 2006/11/07 15:42:44 farrokhi Exp $
+$FreeBSD: www/en/developers.sgml,v 1.143 2006/11/12 12:55:30 koitsu Exp $
 
 -->
 
 <!-- FreeBSD Committers -->
 <!ENTITY a.aaron "Aaron Dalton">
 <!ENTITY a.abial "Andrzej Bialecki">
 <!ENTITY a.ache "Andrey A. Chernov">
 <!ENTITY a.acm "Jos&eacute; Alonso C&aacute;rdenas M&aacute;rquez">
 <!ENTITY a.adam "Adam David">
 <!ENTITY a.adamw "Adam Weinberger">
 <!ENTITY a.ade "Ade Lovett">
 <!ENTITY a.adrian "Adrian Chadd">
 <!ENTITY a.ahze "Michael Johnson">
 <!ENTITY a.akiyama "Shunsuke Akiyama">
 <!ENTITY a.alane "Alan Eldridge">
 <!ENTITY a.alc "Alan L. Cox">
 <!ENTITY a.ale "Alex Dupre">
 <!ENTITY a.alepulver "Alejandro Pulver">
 <!ENTITY a.alex "Alexander Langer">
 <!ENTITY a.alexbl "Alexander Botero-Lowry">
 <!ENTITY a.alfred "Alfred Perlstein">
 <!ENTITY a.ambrisko "Doug Ambrisko">
 <!ENTITY a.amorita "Akio Morita">
 <!ENTITY a.amurai "Atsushi Murai">
 <!ENTITY a.anders "Anders Nordby">
 <!ENTITY a.andre "Andre Oppermann">
 <!ENTITY a.andreas "Andreas Klemm">
 <!ENTITY a.andy "Andrey Zakhvatov">
 <!ENTITY a.anholt "Eric Anholt">
 <!ENTITY a.anray "Andrey Slusar">
 <!ENTITY a.archie "Archie Cobbs">
 <!ENTITY a.ariff "Ariff Abdullah">
 <!ENTITY a.arr "Andrew R. Reiter">
 <!ENTITY a.arun "Arun Sharma">
 <!ENTITY a.arved "Tilman Linneweh">
 <!ENTITY a.asami "Satoshi Asami">
 <!ENTITY a.asmodai "Jeroen Ruigrok/Asmodai">
 <!ENTITY a.assar "Assar Westerlund">
 <!ENTITY a.avatar "Tai-hwa Liang">
 <!ENTITY a.awebster "Andrew Webster">
 <!ENTITY a.az "Andrej Zverev">
 <!ENTITY a.babkin "Sergey Babkin">
 <!ENTITY a.bakul "Bakul Shah">
 <!ENTITY a.barner "Simon Barner">
 <!ENTITY a.bbraun "Rob Braun">
 <!ENTITY a.bde "Bruce Evans">
 <!ENTITY a.bean "Rebecca Visger">
 <!ENTITY a.ben "Ben Smithurst">
 <!ENTITY a.benno "Benno Rice">
 <!ENTITY a.billf "Bill Fumerola">
 <!ENTITY a.blackend "Marc Fonvieille">
 <!ENTITY a.bland "Alexander Nedotsukov">
 <!ENTITY a.bmah "Bruce A. Mah">
 <!ENTITY a.bmilekic "Bosko Milekic">
 <!ENTITY a.bms "Bruce M. Simpson">
 <!ENTITY a.bp "Boris Popov">
 <!ENTITY a.brd "Brad Davis">
 <!ENTITY a.brandon "Brandon Gillespie">
 <!ENTITY a.brian "Brian Somers">
 <!ENTITY a.brooks "Brooks Davis">
 <!ENTITY a.brueffer "Christian Br&uuml;ffer">
 <!ENTITY a.bruno "Bruno Ducrot">
 <!ENTITY a.bsam "Boris Samorodov">
 <!ENTITY a.bsd "Brian S. Dean">
 <!ENTITY a.bvs "Vitaly Bogdanov">
 <!ENTITY a.bz "Bjoern A. Zeeb">
 <!ENTITY a.cawimm "Charles A. Wimmer">
 <!ENTITY a.carvay "J. Vicente Carrasco Vay&aacute;">
 <!ENTITY a.cel "Chuck Lever">
 <!ENTITY a.ceri "Ceri Davies">
 <!ENTITY a.cg "Cameron Grant">
 <!ENTITY a.charnier "Philippe Charnier">
 <!ENTITY a.chern "Chern Lee">
 <!ENTITY a.chinsan "Chin-San Huang">
 <!ENTITY a.chm "Christoph Herrmann">
 <!ENTITY a.chris "Chris Costello">
 <!ENTITY a.chuckr "Chuck Robey">
 <!ENTITY a.cjc "Crist J. Clark">
 <!ENTITY a.cjh "Junho CHOI">
 <!ENTITY a.clement "Clement Laforet">
 <!ENTITY a.clive "Clive Lin">
 <!ENTITY a.clsung "Cheng-Lung Sung">
 <!ENTITY a.cognet "Olivier Houchard">
 <!ENTITY a.cokane "Coleman Kane">
 <!ENTITY a.cp "Chuck Paterson">
 <!ENTITY a.cperciva "Colin Percival">
 <!ENTITY a.cpiazza "Chris Piazza">
 <!ENTITY a.cracauer "Martin Cracauer">
 <!ENTITY a.csgr "Geoff Rehmet">
 <!ENTITY a.cshumway "Christopher Shumway">
 <!ENTITY a.csjp "Christian S.J. Peron">
 <!ENTITY a.cwt "Chris Timmons">
 <!ENTITY a.cy "Cy Schubert">
 <!ENTITY a.daichi "Daichi GOTO">
 <!ENTITY a.damien "Damien Bergamini">
 <!ENTITY a.dan "Dan Moschuk">
 <!ENTITY a.danfe "Alexey Dokuchaev">
 <!ENTITY a.danger "Daniel Ger&#382;o">
 <!ENTITY a.danny "Daniel O'Callaghan">
 <!ENTITY a.dannyboy "Daniel Harris">
 <!ENTITY a.darrenr "Darren Reed">
 <!ENTITY a.das "David Schultz">
 <!ENTITY a.davidc "Chad David">
 <!ENTITY a.davidn "David Nugent">
 <!ENTITY a.davidxu "David Xu">
 <!ENTITY a.dbaker "Daniel Baker">
 <!ENTITY a.dburr "Donald Burr">
 <!ENTITY a.dcs "Daniel C. Sobral">
 <!ENTITY a.dd "Dima Dorfman">
 <!ENTITY a.dds "Diomidis D. Spinellis">
 <!ENTITY a.dec "David E. Cross">
 <!ENTITY a.deischen "Daniel Eischen">
 <!ENTITY a.delphij "Xin Li">
 <!ENTITY a.demon "Dmitry Sivachenko">
 <!ENTITY a.den "Denis Peplin">
 <!ENTITY a.des "Dag-Erling C. Sm&oslash;rgrav">
 <!ENTITY a.dfr "Doug Rabson">
 <!ENTITY a.dg "David Greenman">
 <!ENTITY a.dhartmei "Daniel Hartmeier">
 <!ENTITY a.dhw "David Wolfskill">
 <!ENTITY a.dick "Richard Seaman Jr.">
 <!ENTITY a.dillon "Matthew Dillon">
 <!ENTITY a.dima "Dima Ruban">
 <!ENTITY a.dinoex "Dirk Meyer">
 <!ENTITY a.dirk "Dirk Fr&ouml;mberg">
 <!ENTITY a.dmlb "Duncan Barclay">
 <!ENTITY a.dougb "Doug Barton">
 <!ENTITY a.dt "Dmitrij Tejblum">
 <!ENTITY a.dufault "Peter Dufault">
 <!ENTITY a.dumbbell "Jean-S&eacute;bastien P&eacute;dron">
 <!ENTITY a.dwcjr "David W. Chapman Jr.">
 <!ENTITY a.dwhite "Doug White">
 <!ENTITY a.dwmalone "David Malone">
 <!ENTITY a.edwin "Edwin Groothuis">
 <!ENTITY a.ehaupt "Emanuel Haupt">
 <!ENTITY a.eik "Oliver Eikemeier">
 <!ENTITY a.eivind "Eivind Eklund">
 <!ENTITY a.ejc "Eric J. Chet">
 <!ENTITY a.emaste "Ed Maste">
 <!ENTITY a.emax "Maksim Yevmenkin">
 <!ENTITY a.emoore "Eric Moore">
 <!ENTITY a.eric "Eric Melville">
 <!ENTITY a.erich "Eric L. Hernes">
 <!ENTITY a.erwin "Erwin Lansing">
 <!ENTITY a.fanf "Tony Finch">
 <!ENTITY a.farrokhi "Babak Farrokhi">
 <!ENTITY a.fenner "Bill Fenner">
 <!ENTITY a.fjoe "Max Khon">
 <!ENTITY a.flathill "Seiichirou Hiraoka">
 <!ENTITY a.flz "Florent Thoumie">
 <!ENTITY a.foxfair "Howard F. Hu">
 <!ENTITY a.fsmp "Steve Passe">
 <!ENTITY a.furuta "Atsushi Furuta">
 <!ENTITY a.gad "Garance A Drosehn">
 <!ENTITY a.gallatin "Andrew Gallatin">
 <!ENTITY a.garga "Renato Botelho">
 <!ENTITY a.garys "Gary W. Swearingen">
 <!ENTITY a.gerald "Gerald Pfeifer">
 <!ENTITY a.ghelmer "Guy Helmer">
 <!ENTITY a.gibbs "Justin T. Gibbs">
 <!ENTITY a.gioria "Sebastien Gioria">
 <!ENTITY a.girgen "Palle Girgensohn">
 <!ENTITY a.gj "Gary Jennejohn">
 <!ENTITY a.glebius "Gleb Smirnoff">
 <!ENTITY a.glewis "Greg Lewis">
 <!ENTITY a.gnn "George V. Neville-Neil">
 <!ENTITY a.gordon "Gordon Tetlow">
 <!ENTITY a.gpalmer "Gary Palmer">
 <!ENTITY a.graichen "Thomas Graichen">
 <!ENTITY a.green "Brian F. Feldman">
 <!ENTITY a.grehan "Peter Grehan">
 <!ENTITY a.greid "George C. A. Reid">
 <!ENTITY a.grog "Greg Lehey">
 <!ENTITY a.groudier "Gerard Roudier">
 <!ENTITY a.gryphon "Coranth Gryphon">
 <!ENTITY a.gshapiro "Gregory Neil Shapiro">
 <!ENTITY a.gsutter "Gregory Sutter">
 <!ENTITY a.guido "Guido van Rooij">
 <!ENTITY a.hanai "Hiroyuki HANAI">
 <!ENTITY a.harti "Hartmut Brandt">
 <!ENTITY a.helbig "Wolfgang Helbig">
 <!ENTITY a.hm "Hellmuth Michaelis">
 <!ENTITY a.hmp "Hiten Pandya">
 <!ENTITY a.hoek "Tim Vanderhoek">
 <!ENTITY a.horikawa "Kazuo Horikawa">
 <!ENTITY a.hosokawa "Tatsumi Hosokawa">
 <!ENTITY a.hq "Herve Quiroz">
 <!ENTITY a.hrs "Hiroki Sato">
 <!ENTITY a.hsu "Jeffrey Hsu">
 <!ENTITY a.iedowse "Ian Dowse">
 <!ENTITY a.ijliao "Ying-Chieh Liao">
 <!ENTITY a.ikob "Katsushi Kobayashi">
 <!ENTITY a.imp "Warner Losh">
 <!ENTITY a.imura "R. Imura">
 <!ENTITY a.issei "Issei Suzuki">
 <!ENTITY a.itetcu "Ion-Mihai Tetcu">
 <!ENTITY a.itojun "Jun-ichiro Itoh">
 <!ENTITY a.iwasaki "Mitsuru IWASAKI">
 <!ENTITY a.jake "Jake Burkholder">
 <!ENTITY a.jasone "Jason Evans">
 <!ENTITY a.jayanth "Jayanth Vijayaraghavan">
 <!ENTITY a.jb "John Birrell">
 <!ENTITY a.jcamou "Jesus R. Camou">
 <!ENTITY a.jdp "John Polstra">
 <!ENTITY a.jedgar "Chris D. Faulhaber">
 <!ENTITY a.jeff "Jeff Roberson">
 <!ENTITY a.jeh "James Housley">
 <!ENTITY a.jehamby "Jake Hamby">
 <!ENTITY a.jennifer "Jennifer Yang">
 <!ENTITY a.jesper "Jesper Skriver">
 <!ENTITY a.jesusr "Jesus Rodriguez">
 <!ENTITY a.jfieber "John Fieber">
 <!ENTITY a.jfitz "James FitzGibbon">
 <!ENTITY a.jfv "Jack F. Vogel">
 <!ENTITY a.jgreco "Joe Greco">
 <!ENTITY a.jhay "John Hay">
 <!ENTITY a.jhb "John Baldwin">
 <!ENTITY a.jhs "Julian Stacey">
 <!ENTITY a.jim "Jim Mock">
 <!ENTITY a.jkh "Jordan K. Hubbard">
 <!ENTITY a.jkim "Jung-uk Kim">
 <!ENTITY a.jkois "Johann Kois">
 <!ENTITY a.jkoshy "Joseph Koshy">
 <!ENTITY a.jlemon "Jonathan Lemon">
 <!ENTITY a.jlrobin "James L. Robinson">
 <!ENTITY a.jmacd "Joshua Peck Macdonald">
 <!ENTITY a.jmallett "Juli Mallett">
 <!ENTITY a.jmas "Jose M. Alcaide">
 <!ENTITY a.jmb "Jonathan M. Bresler">
 <!ENTITY a.jmelo "Jean Milanez Melo">
 <!ENTITY a.jmg "John-Mark Gurney">
 <!ENTITY a.jmz "Jean-Marc Zucconi">
 <!ENTITY a.joe "Josef Karthauser">
 <!ENTITY a.joel "Joel Dahl">
 <!ENTITY a.joerg "J&ouml;rg Wunsch">
 <!ENTITY a.johan "Johan Karlsson">
 <!ENTITY a.johans "Johan van Selst">
 <!ENTITY a.john "John Cavanaugh">
 <!ENTITY a.jon "Jonathan Chen">
 <!ENTITY a.josef "Josef El-Rayes">
 <!ENTITY a.jseger "Justin Seger">
 <!ENTITY a.julian "Julian Elischer">
 <!ENTITY a.jvh "Johannes Helander">
 <!ENTITY a.jwd "John W. DeBoskey">
 <!ENTITY a.jylefort "Jean-Yves Lefort">
 <!ENTITY a.kan "Alexander Kabaev">
 <!ENTITY a.karl "Karl Strickland">
 <!ENTITY a.kato "Takenori KATO">
 <!ENTITY a.kbyanc "Kelly Yancey">
 <!ENTITY a.keichii "Michael C. Wu">
 <!ENTITY a.keith "Jing-Tang Keith Jang">
 <!ENTITY a.ken "Kenneth D. Merry">
 <!ENTITY a.kensmith "Ken Smith">
 <!ENTITY a.keramida "Giorgos Keramidas">
 <!ENTITY a.kevlo "Kevin Lo">
 <!ENTITY a.kib "Konstantin Belousov">
 <!ENTITY a.kientzle "Tim Kientzle">
 <!ENTITY a.kiri "Kazuhiko Kiriyama">
 <!ENTITY a.kjc "Kenjiro Cho">
 <!ENTITY a.kmacy "Kip Macy">
 <!ENTITY a.knu "Akinori MUSHA">
 <!ENTITY a.koitsu "Jeremy Chadwick">
 <!ENTITY a.krion "Kirill Ponomarew">
 <!ENTITY a.kris "Kris Kennaway">
 <!ENTITY a.kuriyama "Jun Kuriyama">
 <!ENTITY a.kwm "Koop Mast">
 <!ENTITY a.lars "Lars Fredriksen">
 <!ENTITY a.laszlof "Frank J. Laszlo">
 <!ENTITY a.lawrance "Sam Lawrance">
 <!ENTITY a.lbr "Lars Balker Rasmussen">
 <!ENTITY a.le "Lukas Ertl">
 <!ENTITY a.leeym "Yen-Ming Lee">
 <!ENTITY a.lesi "Dejan Lesjak">
 <!ENTITY a.lev "Lev Serebryakov">
 <!ENTITY a.lile "Larry Lile">
 <!ENTITY a.linimon "Mark Linimon">
 <!ENTITY a.lioux "M&aacute;rio S&eacute;rgio Fujikawa Ferreira">
 <!ENTITY a.ljo "L Jonas Olsson">
 <!ENTITY a.lkoeller "Lars Koeller">
 <!ENTITY a.lofi "Michael Nottebrock">
 <!ENTITY a.logo "Valentino Vaschetto">
 <!ENTITY a.lth "Lars Thegler">
 <!ENTITY a.luigi "Luigi Rizzo">
 <!ENTITY a.luoqi "Luoqi Chen">
 <!ENTITY a.maho "Maho Nakata">
 <!ENTITY a.marcel "Marcel Moolenaar">
 <!ENTITY a.marck "Dmitry Morozovsky">
 <!ENTITY a.marcus "Joe Marcus Clarke">
 <!ENTITY a.marius "Marius Strobl">
 <!ENTITY a.markm "Mark Murray">
 <!ENTITY a.marko "Mark Ovens">
 <!ENTITY a.markp "Mark Pulford">
 <!ENTITY a.marks "Mark Santcroos">
 <!ENTITY a.markus "Markus Br&uuml;ffer">
 <!ENTITY a.martin "Martin Renters">
 <!ENTITY a.mat "Mathieu Arnold">
 <!ENTITY a.matk "Mathew Kanner">
 <!ENTITY a.matteo "Matteo Riondato">
 <!ENTITY a.matusita "Makoto Matsushita">
 <!ENTITY a.max "Masafumi NAKANE">
 <!ENTITY a.maxim "Maxim Konovalov">
 <!ENTITY a.mb "Maxim Bolotin">
 <!ENTITY a.mbarkah "Ade Barkah">
 <!ENTITY a.mbr "Martin Blapp">
 <!ENTITY a.mckay "Stephen McKay">
 <!ENTITY a.mckusick "Kirk McKusick">
 <!ENTITY a.mdodd "Matthew N. Dodd">
 <!ENTITY a.metal "Koichi Suzuki">
 <!ENTITY a.mezz "Jeremy Messenger">
 <!ENTITY a.mharo "Michael Haro">
 <!ENTITY a.mheinen "Martin Heinen">
 <!ENTITY a.mi "Mikhail Teterin">
 <!ENTITY a.mich "Michael L. Hostbaek">
 <!ENTITY a.mike "Mike Barcroft">
 <!ENTITY a.mikeh "Mike Heffner">
 <!ENTITY a.mini "Jonathan Mini">
 <!ENTITY a.mita "Yoshio MITA">
 <!ENTITY a.miwi "Martin Wilke">
 <!ENTITY a.mjacob "Matthew Jacob">
 <!ENTITY a.mks "Mike Spengler">
 <!ENTITY a.mlaier "Max Laier">
 <!ENTITY a.mnag "Marcus Alves Grando">
 <!ENTITY a.mohans "Mohan Srinivasan">
 <!ENTITY a.motoyuki "Motoyuki Konno">
 <!ENTITY a.mp "Mark Peek">
 <!ENTITY a.mph "Matthew Hunt">
 <!ENTITY a.mpp "Mike Pritchard">
 <!ENTITY a.mr "Michael Reifenberger">
 <!ENTITY a.msmith "Michael Smith">
 <!ENTITY a.mtaylor "Mark J. Taylor">
 <!ENTITY a.mtm "Mike Makonnen">
 <!ENTITY a.murray "Murray Stokely">
 <!ENTITY a.mux "Maxime Henrion">
 <!ENTITY a.mwlucas "Michael W. Lucas">
 <!ENTITY a.naddy "Christian Weisgerber">
 <!ENTITY a.nakai "Yukihiro Nakai">
 <!ENTITY a.nate "Nate Williams">
 <!ENTITY a.nbm "Neil Blakey-Milner">
 <!ENTITY a.nectar "Jacques Vidrine">
 <!ENTITY a.netchild "Alexander Leidinger">
 <!ENTITY a.newton "Mark Newton">
 <!ENTITY a.nhibma "Nick Hibma">
 <!ENTITY a.niels "Niels Heinen">
 <!ENTITY a.nik "Nik Clayton">
 <!ENTITY a.niklas "Niklas Saers">
 <!ENTITY a.njl "Nate Lawson">
 <!ENTITY a.nobutaka "Nobutaka MANTANI">
 <!ENTITY a.non "Noriaki Mitsunaga">
 <!ENTITY a.nork "Norikatsu Shigemura">
 <!ENTITY a.novel "Roman Bogorodskiy">
 <!ENTITY a.nsayer "Nick Sayer">
 <!ENTITY a.nsouch "Nicolas Souchu">
 <!ENTITY a.nyan "Yoshihiro Takahashi">
 <!ENTITY a.obraun "Oliver Braun">
 <!ENTITY a.obrien "David O'Brien">
 <!ENTITY a.okazaki "Tetsurou OKAZAKI">
 <!ENTITY a.oleg "Oleg Bulyzhin">
 <!ENTITY a.olgeni "Jimmy Olgeni">
 <!ENTITY a.oliver "Oliver Lehmann">
 <!ENTITY a.onoe "Atsushi Onoe">
 <!ENTITY a.orion "Orion Hodson">
 <!ENTITY a.osa "Sergey A. Osokin">
 <!ENTITY a.pat "Patrick Li">
 <!ENTITY a.patrick "Patrick S. Gardella">
 <!ENTITY a.paul "Paul Richards">
 <!ENTITY a.pav "Pav Lucistnik">
 <!ENTITY a.pb "Pierre Beyssac">
 <!ENTITY a.pdeuskar "Prafulla S. Deuskar">
 <!ENTITY a.pds "Peter da Silva">
 <!ENTITY a.peadar "Peter Edwards">
 <!ENTITY a.perky "Hye-Shik Chang">
 <!ENTITY a.petef "Pete Fritchman">
 <!ENTITY a.peter "Peter Wemm">
 <!ENTITY a.phantom "Alexey Zelkin">
 <!ENTITY a.philip "Philip Paeps">
 <!ENTITY a.phk "Poul-Henning Kamp">
 <!ENTITY a.pho "Peter Holm">
 <!ENTITY a.piero "Piero Serini">
 <!ENTITY a.pirzyk "Jim Pirzyk">
 <!ENTITY a.piso "Paolo Pisati">
 <!ENTITY a.pjd "Pawel Jakub Dawidek">
 <!ENTITY a.proven "Chris Provenzano">
 <!ENTITY a.ps "Paul Saab">
 <!ENTITY a.pst "Paul Traina">
 <!ENTITY a.qingli "Qing Li">
 <!ENTITY a.rafan "Rong-En Fan">
 <!ENTITY a.rees "Jim Rees">
 <!ENTITY a.reg "Jeremy Lea">
 <!ENTITY a.remko "Remko Lodder">
 <!ENTITY a.rgrimes "Rodney Grimes">
 <!ENTITY a.ricardag "Ricardo AG">
 <!ENTITY a.rich "Rich Murphey">
 <!ENTITY a.rik "Roman Kurakin">
 <!ENTITY a.rink "Rink Springer">
 <!ENTITY a.rnordier "Robert Nordier">
 <!ENTITY a.roam "Peter Pentchev">
 <!ENTITY a.robert "Robert Drehmel">
 <!ENTITY a.roberto "Ollivier Robert">
 <!ENTITY a.rodrigc "Craig Rodrigues">
 <!ENTITY a.roger "Roger Hardiman">
 <!ENTITY a.rpratt "Randy Pratt">
 <!ENTITY a.rrs "Randall R. Stewart">
 <!ENTITY a.rse "Ralf S. Engelschall">
 <!ENTITY a.rsm "Scott Mitchell">
 <!ENTITY a.ru "Ruslan Ermilov">
 <!ENTITY a.rushani "Hideyuki KURASHINA">
 <!ENTITY a.rv "Rajesh Vaidheeswarran">
 <!ENTITY a.rvb "Robert V. Baron">
 <!ENTITY a.rwatson "Robert Watson">
 <!ENTITY a.sada "SADA Kenji">
 <!ENTITY a.sah "Sam Hopkins">
 <!ENTITY a.sam "Sam Leffler">
 <!ENTITY a.sanpei "Yoshiro Sanpei MIHIRA">
 <!ENTITY a.sat "Andrew Pantyukhin">
 <!ENTITY a.schweikh "Jens Schweikhardt">
 <!ENTITY a.scop "Ville Skytt&auml;">
 <!ENTITY a.scottl "Scott Long">
 <!ENTITY a.scrappy "Marc G. Fournier">
 <!ENTITY a.se "Stefan Esser">
 <!ENTITY a.seanc "Sean Chittenden">
 <!ENTITY a.sef "Sean Eric Fagan">
 <!ENTITY a.sem "Sergey Matveychuk">
 <!ENTITY a.semenu "Semen Ustimenko">
 <!ENTITY a.sergei "Sergei Kolobov">
 <!ENTITY a.sf "Satsuki FUJISHIMA">
 <!ENTITY a.shafeeq "Shafeeq Sinnamohideen">
 <!ENTITY a.shaun "Shaun Amott">
 <!ENTITY a.sheldonh "Sheldon Hearn">
 <!ENTITY a.shiba "Takeshi Shibagaki">
 <!ENTITY a.shige "Shigeyuki Fukushima">
 <!ENTITY a.shin "Yoshinobu Inoue">
 <!ENTITY a.silby "Mike Silbersack">
 <!ENTITY a.simokawa "Hidetoshi Shimokawa">
 <!ENTITY a.simon "Simon L. Nielsen">
 <!ENTITY a.skv "Sergey Skvortsov">
 <!ENTITY a.smace "Scott Mace">
 <!ENTITY a.smkelly "Sean Kelly">
 <!ENTITY a.smpatel "Sujal Patel">
 <!ENTITY a.sobomax "Maxim Sobolev">
 <!ENTITY a.sos "S&oslash;ren Schmidt">
 <!ENTITY a.ssouhlal "Suleiman Souhlal">
 <!ENTITY a.stanislav "G. Adam Stanislav">
 <!ENTITY a.stark "Gene Stark">
 <!ENTITY a.stas "Stanislav Sedov">
 <!ENTITY a.stb "Stefan Bethke">
 <!ENTITY a.stefan "Stefan Walter">
 <!ENTITY a.stefanf "Stefan Farfeleder">
 <!ENTITY a.stephane "St&eacute;phane Legrand">
 <!ENTITY a.steve "Steve Price">
 <!ENTITY a.sumikawa "Munechika Sumikawa">
 <!ENTITY a.suz "SUZUKI Shinsuke">
 <!ENTITY a.swallace "Steven Wallace">
 <!ENTITY a.syrinx "Shteryana Shopova">
 <!ENTITY a.tackerman "Tony Ackerman">
 <!ENTITY a.takawata "Takanori Watanabe">
 <!ENTITY a.tanimura "Seigo Tanimura">
 <!ENTITY a.taoka "Satoshi Taoka">
 <!ENTITY a.tdb "Tim Bishop">
 <!ENTITY a.tedm "Ted Mittelstaedt">
 <!ENTITY a.tegge "Tor Egge">
 <!ENTITY a.tg "Thomas Gellekum">
 <!ENTITY a.thepish "Peter Hawkins">
 <!ENTITY a.thierry "Thierry Thomas">
 <!ENTITY a.thomas "Thomas Quinot">
 <!ENTITY a.thompsa "Andrew Thompson">
 <!ENTITY a.ticso "Bernd Walter">
 <!ENTITY a.tjr "Tim J. Robbins">
 <!ENTITY a.tmclaugh "Tom McLaughlin">
 <!ENTITY a.tmm "Thomas M&ouml;stl">
 <!ENTITY a.tobez "Anton Berezin">
 <!ENTITY a.tom "Tom Hukins">
 <!ENTITY a.tomsoft "Thomas-Henning von Kamptz">
 <!ENTITY a.torstenb "Torsten Blum">
 <!ENTITY a.toshi "Toshihiko Arai">
 <!ENTITY a.trevor "Trevor Johnson">
 <!ENTITY a.trhodes "Tom Rhodes">
 <!ENTITY a.truckman "Don &ldquo;Truck&rdquo; Lewis">
 <!ENTITY a.tshiozak "Takuya SHIOZAKI">
 <!ENTITY a.twinterg "Thomas Wintergerst">
 <!ENTITY a.uch "Yasushi UCHIYAMA">
 <!ENTITY a.ue "Udo Erdelhoff">
 <!ENTITY a.ugen "Ugen J.S.Antsilevich">
 <!ENTITY a.uhclem "Frank Durda IV">
 <!ENTITY a.ulf "Ulf Zimmermann">
 <!ENTITY a.ume "Hajimu UMEMOTO">
 <!ENTITY a.unfurl "Bill Swingle">
 <!ENTITY a.ups "Stephan Uphoff">
 <!ENTITY a.vanilla "Vanilla I. Shu">
 <!ENTITY a.vd "Vasil Dimov">
 <!ENTITY a.viny "Vincent Tougait">
 <!ENTITY a.vkashyap "Vinod Kashyap">
 <!ENTITY a.vs "Volker Stolz">
 <!ENTITY a.vsevolod "Vsevolod Stakhov">
 <!ENTITY a.wes "Wes Peters">
 <!ENTITY a.whiteside "Don Whiteside">
 <!ENTITY a.wilko "Wilko Bulte">
 <!ENTITY a.will "Will Andrews">
 <!ENTITY a.wjv "Johann Visagie">
 <!ENTITY a.wkoszek "Wojciech A. Koszek">
 <!ENTITY a.wollman "Garrett Wollman">
 <!ENTITY a.wosch "Wolfram Schneider">
 <!ENTITY a.wpaul "Bill Paul">
 <!ENTITY a.wsalamon "Wayne Salamon">
 <!ENTITY a.wsanchez "Wilfredo S&aacute;nchez">
 <!ENTITY a.wylie "Wylie Stilwell">
 <!ENTITY a.yar "Yar Tikhiy">
 <!ENTITY a.yoichi "Yoichi NAKAYAMA">
 <!ENTITY a.yokota "Kazutaka YOKOTA">
 <!ENTITY a.yongari "Pyun YongHyeon">
 <!ENTITY a.xride "S&oslash;ren Straarup">
 <!ENTITY a.zarzycki "Dave Zarzycki">
 <!ENTITY a.znerd "Ernst de Haan">
 
 <!-- Additional contributors -->
 <!ENTITY a.re "re@FreeBSD.org">
 <!ENTITY a.mkm "Kyle&nbsp;Martin">
 <!ENTITY a.joe.halpin "Joe&nbsp;Halpin">
 <!ENTITY a.pavalos "Peter&nbsp;Avalos">
 <!ENTITY a.jwojdacki "Justin&nbsp;Wojdacki">
 
 <!-- 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 Bugmeister -->
 <!ENTITY a.bugmeister '&a.ceri;, &a.linimon;'>
 
 <!-- FreeBSD Doc Engineering Team -->
 <!ENTITY a.doceng '&a.nik;, &a.murray;, &a.ru;, &a.hrs;, &a.blackend;'>
 
 <!-- FreeBSD Donations Liaison -->
 <!ENTITY a.donations '&a.brueffer;, &a.mwlucas;, &a.nsayer;, &a.obrien;, &a.rwatson;, &a.trhodes;, &a.wilko;'>
 
 <!-- FreeBSD Ports Manager Team -->
-<!ENTITY a.portmgr '&a.kris;, &a.marcus;, &a.linimon;, &a.clement;, &a.krion;, &a.erwin;'>
+<!ENTITY a.portmgr '&a.marcus;, &a.kris;, &a.clement;, &a.erwin;, &a.linimon;, &a.pav;, &.krion;'>
 
 <!-- FreeBSD Release Engineering Teams -->
 <!ENTITY a.re.members '&a.murray;, &a.rwatson;, &a.dwhite;, &a.kensmith;, &a.hrs;, &a.mux;, &a.bmah;'>
 <!ENTITY a.re-alpha '&a.murray;, &a.rwatson;, &a.wilko;'>
 <!ENTITY a.re-amd64 '&a.obrien;'>
 <!ENTITY a.re-ia64 '&a.marcel;'>
 <!ENTITY a.re-i386 '&a.murray;, &a.rwatson;'>
 <!ENTITY a.re-pc98 '&a.nyan;'>
 <!ENTITY a.re-powerpc '&a.grehan;'>
 <!ENTITY a.re-sparc64 '&a.jake;, &a.murray;, &a.phk;, &a.rwatson;, &a.tmm;, &a.kensmith;, &a.obrien;'>
 
 <!-- FreeBSD Security Officer -->
 <!ENTITY a.so '&a.cperciva;'>
 
 <!ENTITY a.so-team '&a.mnag;, &a.remko;, &a.gnn;, &a.simon;, &a.philip;, &a.cperciva;, &a.csjp;, &a.des;, &a.nectar;, &a.rwatson;'>