diff --git a/en/internal/machines.sgml b/en/internal/machines.sgml
index 29c47e617d..8c35264317 100644
--- a/en/internal/machines.sgml
+++ b/en/internal/machines.sgml
@@ -1,412 +1,412 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/internal/machines.sgml,v 1.72 2006/08/14 17:48:26 simon Exp $">
+<!ENTITY date "$FreeBSD: www/en/internal/machines.sgml,v 1.73 2006/08/19 21:20:35 hrs Exp $">
 <!ENTITY title "The FreeBSD.org Network">
 <!ENTITY % navinclude.docs "INCLUDE">
 ]>
 
 <html>
 &header;
 
 <p>This page documents, for those with accounts on the
 FreeBSD.org network, just what machine resources are currently
 available and the sorts of jobs they are being provided for.</p>
 
 <p>For a list of SSH host keys and their fingerprints for the
 public FreeBSD.org machines, please see <a href="ssh-keys.asc">
 this file</a>.</p>
 
 <h2>All host names in the FreeBSD.org domain</h2>
 
 <table class="tblbasic">
 <thead>
 <tr>
 <th align="left">Host</th>
 <th align="left">OS</th>
 <th align="left">Purpose</th>
 <th align="left">Owner(s)</th>
 </tr>
 </thead>
 
 <tbody>
 
 <tr>
 <td>beast</td>
 <td>5-STABLE</td>
 <td>Alpha box for FreeBSD/alpha testing</td>
 <td>obrien/peter</td>
 </tr>
 
 <tr>
 <td>builder</td>
 <td>6-STABLE</td>
 <td>BSD/OS source holder<br>
   Build box for the FreeBSD documentation for the FTP site</td>
 <td>committers</td>
 </tr>
 
 <tr>
 <td>freefall</td>
 <td>6-STABLE</td>
 <td>GNATS/shell logins</td>
 <td>committers</td>
 </tr>
 
 <tr>
 <td>ftp-master</td>
-<td>4-STABLE</td>
+<td>6-STABLE</td>
 <td>ftp master (stage server)</td>
 <td>peter/kuriyama/obrien/steve</td>
 </tr>
 
 <tr>
 <td>gohan10-17</td>
 <td>6-STABLE/7-CURRENT</td>
 <td>Ports building cluster</td>
 <td>ports team</td>
 </tr>
 
 <tr>
 <td>gohan20-39</td>
 <td>6-STABLE/7-CURRENT</td>
 <td>Ports building cluster</td>
 <td>ports team</td>
 </tr>
 
 <tr>
 <td>hub</td>
 <td>6-STABLE</td>
 <td>Mail services</td>
 <td>postmaster</td>
 </tr>
 
 <tr>
 <td>mx1</td>
-<td>4-STABLE</td>
+<td>6-STABLE</td>
 <td>Inbound mail services</td>
 <td>dhw/peter</td>
 </tr>
 
 <tr>
 <td>mx2</td>
 <td>4-STABLE</td>
 <td>Outbound mail services</td>
 <td>dhw/peter</td>
 </tr>
 
 <tr>
 <td>ncvsup (cvsup10)</td>
 <td>6-STABLE</td>
 <td>Public CVSup mirror</td>
 <td>kuriyama</td>
 </tr>
 
 <tr>
 <td>ns0</td>
 <td>4-STABLE</td>
 <td>FreeBSD.org domain master</td>
 <td>dg/ps/peter</td>
 </tr>
 
 <tr>
 <td>panther</td>
 <td>-CURRENT</td>
 <td>Reference machine for testing sparc64 changes <i>(currently
   down)</i></td>
 <td>committers</td>
 </tr>
 
 <tr>
 <td>pluto1</td>
 <td>-CURRENT</td>
 <td>Reference machine for testing ia64 changes</td>
 <td>committers</td>
 </tr>
 
 <tr>
 <td>pluto2</td>
 <td>6-STABLE</td>
 <td>Reference machine for testing ia64 changes</td>
 <td>committers</td>
 </tr>
 
 <tr>
 <td>pointyhat</td>
 <td>-CURRENT</td>
 <td>All architectures package build master</td>
 <td>ports team</td>
 </tr>
 
 <tr>
 <td>ref4</td>
 <td>4-STABLE</td>
 <td>Reference machine for testing 4-STABLE changes</td>
 <td>committers</td>
 </tr>
 
 <tr>
 <td>repoman</td>
 <td>6-STABLE</td>
 <td>CVS master repository</td>
 <td>peter</td>
 </tr>
 
 <tr>
 <td>sledge</td>
 <td>-CURRENT</td>
 <td>Reference machine for testing amd64 changes</td>
 <td>committers</td>
 </tr>
 
 <tr>
 <td>spit (cvsup-master)</td>
 <td>6-STABLE</td>
 <td>CVSup master mirror</td>
 <td>kuriyama</td>
 </tr>
 
 <tr>
 <td>www</td>
 <td>4-STABLE</td>
 <td>Web services</td>
 <td>webmaster</td>
 </tr>
 
 </tbody>
 </table>
 
 
 <h2>Hardware configurations</h2>
 
 <table class="tblbasic">
 <thead>
 <tr>
 <th align="left">Host</th>
 <th align="left">Type</th>
 <th align="left">Hardware</th>
 </tr>
 </thead>
 
 <tbody>
 
 <tr valign="top">
 <td>beast</td>
 <td>API UP2000</td>
 <td>2 x 833MHz Alpha 21264 with 8MB L2cache, 2GB mem, Adaptec 2940U2W SCSI
 controller, 2 SCSI U160 drives, 3COM 3c905B NIC.</td>
 </tr>
 
 <tr valign="top">
 <td>builder</td>
 <td>Intel x86</td>
 <td>800MHz Pentium III, 512MB mem, 40GB Seagate ATA drive,
 Intel EtherExpress Pro 10/100B NIC.</td>
 </tr>
 
 <tr valign="top">
 <td>freefall</td>
 <td>Intel x86</td>
 <td>800MHz Pentium III, 1024MB mem, Mylex DAC960 PCI SCSI RAID
 controller, 5x18GB SCSI U2W drives, 
 Intel EtherExpress Pro 10/100B NIC.</td>
 </tr>
 
 <tr valign="top">
 <td>ftp-master</td>
 <td>Intel x86</td>
-<td>2 x 850MHz Pentium III, 2048MB mem, 3ware 8-port IDE controller (twe),
-  Intel EtherExpress Pro 10/100B NIC.</td>
+<td>2.66GHz Pentium 4, 1024MB mem, 40GB Maxtor ATA drive,
+  Broadcom BCM5703 Gigabit Ethernet NIC.</td>
 </tr>
 
 <tr valign="top">
 <td>gohan10-17</td>
 <td>Intel x86</td>
 <td>800MHz Pentium III, 512MB mem, Intel ICH ATA66 controller,
 1x30GB ATA66 drive, Intel EtherExpress Pro 10/100B NIC.</td>
 </tr>
 
 <tr valign="top">
 <td>gohan20-39</td>
 <td>&nbsp;</td>
 <td>&nbsp;</td>
 </tr>
 
 <tr valign="top">
 <td>hub</td>
 <td>Intel x86</td>
 <td>2 x 600MHz Pentium III, 1GB mem,  Mylex DAC960 PCI SCSI RAID controller,
 3x9GB SCSI WIDE drives, Intel EtherExpress Pro 10/100B NIC.</td>
 </tr>
 
 <tr valign="top">
 <td>mx1</td>
 <td>&nbsp;</td>
 <td>&nbsp;</td>
 </tr>
 
 <tr valign="top">
 <td>mx2</td>
 <td>Intel x86</td>
 <td>850MHz FC-PGA Pentium III, 512MB mem, LSI 53C1010 U160 SCSI,
 1x18GB 10K RPM U160 SCSI drive, Intel EtherExpress Pro 10/100B NIC.</td>
 </tr>
 
 <tr valign="top">
 <td>ncvsup (cvsup10)</td>
 <td>&nbsp;</td>
 <td>&nbsp;</td>
 </tr>
 
 <tr valign="top">
 <td>ns0</td>
 <td>&nbsp;</td>
 <td>&nbsp;</td>
 </tr>
 
 <tr valign="top">
 <td>panther</td>
 <td>Sun OEM ATX Panther board</td>
 <td>300 MHz UltraSparc-IIi, 512MB mem,
 2x9GB 10K RPM Ultra2 SCSI drives, Sun HME 10/100B NIC.</td>
 </tr>
 
 <tr valign="top">
 <td>pluto1, pluto2</td>
 <td>HP rx2600 (IA-64)</td>
 <td>2x900MHz Itanium2 (McKinley) - HP zx1 (pluto) chipset,
 2048MB mem (only 1024MB enabled), LSILogic 1030 U320 SCSI controller (mpt),
 1x36GB 10K RPM U160 SCSI drive, Broadcom BCM5701 10/100/1000 NIC.</td>
 </tr>
 
 <tr valign="top">
 <td>pointyhat</td>
 <td>Intel x86 MP</td>
 <td>2x1266MHz Pentium III, 2048MB mem, 3ware 4-port IDE controller (twe),
 4x160GB UltraATA drives in RAID 1+0 mode.
 Intel EtherExpress Pro 10/100B NIC.</td>
 </tr>
 
 <tr valign="top">
 <td>ref4</td>
 <td>Intel x86</td>
 <td>550MHz FC-PGA Celeron, 1024MB mem,
 1x17GB SCSI drive, Intel EtherExpress Pro 10/100B NIC.</td>
 </tr>
 
 <tr valign="top">
 <td>repoman</td>
 <td>AMD64 MP</td>
 <td>2x2.4GHz Opteron 280 (dual core), 8192MB mem,
 HP Smart Array 6i RAID controller,
 Broadcom BCM5704C Gigabit NIC.</td>
 </tr>
 
 <tr valign="top">
 <td>sledge</td>
 <td>Rioworks HDAMA (AMD64)</td>
 <td>2x1.8GHz Opteron 244 - AMD 8111/8131 chipset, 8192MB mem,
 1x40GB Seagate ST340014A IDE drive, Broadcom BCM5703 10/100/1000 NIC.</td>
 </tr>
 
 <tr valign="top">
 <td>spit (cvsup-master)</td>
 <td>&nbsp;</td>
 <td>&nbsp;</td>
 </tr>
 
 <tr valign="top">
 <td>www</td>
 <td>Intel x86</td>
 <td>2 x 600MHz Pentium III, 1024MB mem, 3ware 4-port IDE controller (twe),
   Intel EtherExpress Pro 10/100B NIC.</td>
 </tr>
 
 </tbody>
 </table>
 
 <p>All machines are connected at 100Mbit/sec full-duplex to a dedicated
 Cisco 2948G switch with redundant gigabit uplinks.  Internet connectivity
 and colocation is provided by <a href="http://www.yahoo.com/">Yahoo!</a>.
 All systems have logged serial consoles and remote power control.</p>
 
 <h2>Ports-building cluster in Korea</h2>
 
 <table class="tblbasic">
 <thead>
 <tr>
 <th align="left">Host</th>
 <th align="left">OS</th>
 <th align="left">Purpose</th>
 <th align="left">Owner(s)</th>
 </tr>
 </thead>
 
 <tbody>
 
 <tr>
 <td>dalki, dosirak, haessal</td>
 <td>5-CURRENT</td>
 <td>Ports building cluster</td>
 <td>ports team</td>
 </tr>
 
 </tbody>
 </table>
 
 <h2>Hardware configurations</h2>
 
 <table class="tblbasic">
 <thead>
 <tr>
 <th align="left">Host</th>
 <th align="left">Type</th>
 <th align="left">Hardware</th>
 </tr>
 </thead>
 
 <tbody>
 
 <tr valign="top">
 <td>dalki, haessal</td>
 <td>Intel x86</td>
 <td>2x2.20GHz Pentium 4 Xeon, 2GB mem, Adaptec aic7899 Ultra160 SCSI adapter,
 1x36GB SCSI-3 drive, 2xIntel EtherExpress Pro 10/100B NIC.
 </tr>
 
 <tr valign="top">
 <td>dosirak</td>
 <td>Intel x86</td>
 <td>2x2.20GHz Pentium 4 Xeon, 4GB mem, Adaptec aic7899 Ultra160 SCSI adapter,
 1x36GB SCSI-3 drive, 2xIntel EtherExpress Pro 10/100B NIC.
 </tr>
 
 </tbody>
 </table>
 
 <p>All machines are connected at 100Mbit/sec full-duplex to a dedicated
 Cisco 2950G switch with redundant gigabit uplinks.  Internet connectivity
 and colocation is provided by <a href="http://kr.yahoo.com/">Yahoo!
 Korea</a> and <a href="http://www.kidc.net/">KIDC</a>. The machines
 are provided by <a href="http://www.eslim.co.kr/">eSlim Korea</a>.</p>
 
 <h2>Administrative Policies</h2>
 
 <p>If the machine in question is "owned" by someone specific, please
 direct queries to them first when asking about administrative issues,
 this includes changes to user accounts or filesystem layout.</p>
 
 <p>All new user accounts must be cleared with the admin staff,
 and are given
 only to FreeBSD developers, either in the docs, ports or general
 src hacking category. Accounts may be given to non-project developers 
 if they have a specific need to test something of a truly experimental 
 nature and need access to a FreeBSD machine for the purpose.  See
 <a href="new-account.html">New Account Creation Procedure page</a> for
 details on new accounts.  Accounts
 are not given to the general public for "vanity domain" mail or 
 other such uses.  It would be a waste of time to ask.  Thanks.</p>
 
 <p></p><A HREF="internal.html">FreeBSD Internal Home</a>
 &footer;
 </body>
 </html>

Host	OS	Purpose	Owner(s)
beast	5-STABLE	Alpha box for FreeBSD/alpha testing	obrien/peter
builder	6-STABLE	BSD/OS source holder Build box for the FreeBSD documentation for the FTP site	committers
freefall	6-STABLE	GNATS/shell logins	committers
ftp-master	4-STABLE	6-STABLE	ftp master (stage server)	peter/kuriyama/obrien/steve
gohan10-17	6-STABLE/7-CURRENT	Ports building cluster	ports team
gohan20-39	6-STABLE/7-CURRENT	Ports building cluster	ports team
hub	6-STABLE	Mail services	postmaster
mx1	4-STABLE	6-STABLE	Inbound mail services	dhw/peter
mx2	4-STABLE	Outbound mail services	dhw/peter
ncvsup (cvsup10)	6-STABLE	Public CVSup mirror	kuriyama
ns0	4-STABLE	FreeBSD.org domain master	dg/ps/peter
panther	-CURRENT	Reference machine for testing sparc64 changes (currently down)	committers
pluto1	-CURRENT	Reference machine for testing ia64 changes	committers
pluto2	6-STABLE	Reference machine for testing ia64 changes	committers
pointyhat	-CURRENT	All architectures package build master	ports team
ref4	4-STABLE	Reference machine for testing 4-STABLE changes	committers
repoman	6-STABLE	CVS master repository	peter
sledge	-CURRENT	Reference machine for testing amd64 changes	committers
spit (cvsup-master)	6-STABLE	CVSup master mirror	kuriyama
www	4-STABLE	Web services	webmaster
Host	Type	Hardware
beast	API UP2000	2 x 833MHz Alpha 21264 with 8MB L2cache, 2GB mem, Adaptec 2940U2W SCSI controller, 2 SCSI U160 drives, 3COM 3c905B NIC.
builder	Intel x86	800MHz Pentium III, 512MB mem, 40GB Seagate ATA drive, Intel EtherExpress Pro 10/100B NIC.
freefall	Intel x86	800MHz Pentium III, 1024MB mem, Mylex DAC960 PCI SCSI RAID controller, 5x18GB SCSI U2W drives, Intel EtherExpress Pro 10/100B NIC.
ftp-master	Intel x86	2 x 850MHz Pentium III, 2048MB mem, 3ware 8-port IDE controller (twe), - Intel EtherExpress Pro 10/100B NIC.	2.66GHz Pentium 4, 1024MB mem, 40GB Maxtor ATA drive, + Broadcom BCM5703 Gigabit Ethernet NIC.
gohan10-17	Intel x86	800MHz Pentium III, 512MB mem, Intel ICH ATA66 controller, 1x30GB ATA66 drive, Intel EtherExpress Pro 10/100B NIC.
gohan20-39
hub	Intel x86	2 x 600MHz Pentium III, 1GB mem, Mylex DAC960 PCI SCSI RAID controller, 3x9GB SCSI WIDE drives, Intel EtherExpress Pro 10/100B NIC.
mx1
mx2	Intel x86	850MHz FC-PGA Pentium III, 512MB mem, LSI 53C1010 U160 SCSI, 1x18GB 10K RPM U160 SCSI drive, Intel EtherExpress Pro 10/100B NIC.
ncvsup (cvsup10)
ns0
panther	Sun OEM ATX Panther board	300 MHz UltraSparc-IIi, 512MB mem, 2x9GB 10K RPM Ultra2 SCSI drives, Sun HME 10/100B NIC.
pluto1, pluto2	HP rx2600 (IA-64)	2x900MHz Itanium2 (McKinley) - HP zx1 (pluto) chipset, 2048MB mem (only 1024MB enabled), LSILogic 1030 U320 SCSI controller (mpt), 1x36GB 10K RPM U160 SCSI drive, Broadcom BCM5701 10/100/1000 NIC.
pointyhat	Intel x86 MP	2x1266MHz Pentium III, 2048MB mem, 3ware 4-port IDE controller (twe), 4x160GB UltraATA drives in RAID 1+0 mode. Intel EtherExpress Pro 10/100B NIC.
ref4	Intel x86	550MHz FC-PGA Celeron, 1024MB mem, 1x17GB SCSI drive, Intel EtherExpress Pro 10/100B NIC.
repoman	AMD64 MP	2x2.4GHz Opteron 280 (dual core), 8192MB mem, HP Smart Array 6i RAID controller, Broadcom BCM5704C Gigabit NIC.
sledge	Rioworks HDAMA (AMD64)	2x1.8GHz Opteron 244 - AMD 8111/8131 chipset, 8192MB mem, 1x40GB Seagate ST340014A IDE drive, Broadcom BCM5703 10/100/1000 NIC.
spit (cvsup-master)
www	Intel x86	2 x 600MHz Pentium III, 1024MB mem, 3ware 4-port IDE controller (twe), Intel EtherExpress Pro 10/100B NIC.
Host	Type	Hardware
dalki, haessal	Intel x86	2x2.20GHz Pentium 4 Xeon, 2GB mem, Adaptec aic7899 Ultra160 SCSI adapter, 1x36GB SCSI-3 drive, 2xIntel EtherExpress Pro 10/100B NIC.
dosirak	Intel x86	2x2.20GHz Pentium 4 Xeon, 4GB mem, Adaptec aic7899 Ultra160 SCSI adapter, 1x36GB SCSI-3 drive, 2xIntel EtherExpress Pro 10/100B NIC.