diff --git a/en/internal/machines.sgml b/en/internal/machines.sgml
index 6dea7d68a8..0e2c065d16 100644
--- a/en/internal/machines.sgml
+++ b/en/internal/machines.sgml
@@ -1,375 +1,375 @@
 <!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.86 2007/10/14 22:08:13 obrien Exp $">
+<!ENTITY date "$FreeBSD: www/en/internal/machines.sgml,v 1.87 2007/11/17 12:35:01 simon 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>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>7-CURRENT</td>
 <td>GNATS/shell Logins.</td>
 <td>committers</td>
 </tr>
 
 <tr>
 <td>ftp-master</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 Build cluster.</td>
 <td>ports team</td>
 </tr>
 
 <tr>
 <td>gohan20-39</td>
 <td>6-STABLE/7-CURRENT</td>
 <td>Ports Build cluster.</td>
 <td>ports team</td>
 </tr>
 
 <tr>
 <td>hub</td>
 <td>6-STABLE</td>
 <td>Mailing Lists and Mail services.</td>
 <td>postmaster</td>
 </tr>
 
 <tr>
 <td>mx1</td>
 <td>6-STABLE</td>
 <td>Inbound Mail services.</td>
 <td>admins</td>
 </tr>
 
 <tr>
 <td>mx2</td>
 <td>6-STABLE</td>
 <td>Outbound Mail services.</td>
 <td>admins</td>
 </tr>
 
 <tr>
 <td>ns0</td>
 <td>6-STABLE</td>
 <td>A FreeBSD.org authoritative DNS Server.</td>
 <td>admins</td>
 </tr>
 
 <tr>
 <td>ns1, ns2</td>
 <td>7-CURRENT</td>
 <td>FreeBSD.org recursive DNS Server.</td>
 <td>clusteradm</td>
 </tr>
 
 <tr>
 <td>pluto1</td>
-<td>-CURRENT</td>
+<td>7-STABLE</td>
 <td>Reference machine for testing ia64 changes.</td>
 <td>committers</td>
 </tr>
 
 <tr>
 <td>pluto2</td>
-<td>6-STABLE</td>
+<td>-CURRENT</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>repoman</td>
 <td>6-STABLE</td>
 <td>CVS Master repository.</td>
 <td>admins</td>
 </tr>
 
 <tr>
 <td>sky</td>
 <td>7-CURRENT</td>
 <td>The New www.FreeBSD.org Webserver.</td>
 <td>committers</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>admins</td>
 </tr>
 
 <tr>
 <td>www</td>
 <td>6-STABLE</td>
 <td>The www.FreeBSD.org Webserver.</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>builder</td>
 <td>Intel x86</td>
 <td>800MHz Pentium III, 512MB Memory, 40GB Seagate ATA drive,
 Intel EtherExpress Pro 10/100B NIC.</td>
 </tr>
 
 <tr valign="top">
 <td>freefall</td>
 <td>Intel x86</td>
 <td>2x dual-core 2.80GHz Xeon (Pentium-IV family), 2GB Memory,
 Compaq Smart Array 5i SCSI RAID controller, 138 GB SCSI local storage, 
 Broadcom-based Compaq NC7781 Gigabit Server Adapter NIC.</td>
 </tr>
 
 <tr valign="top">
 <td>ftp-master</td>
 <td>Intel x86</td>
 <td>2.66GHz Pentium 4, 1GB Memory, 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 Memory, 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>AMD64 MP</td>
 <td>4x2.2Ghz (dual CPU, dual core), 3GB Memory, Adaptec RAID Controller,
 4x36GB U160 SCSI Disk, Broadcom Gigabit Ethernet.</td>
 </tr>
 
 <tr valign="top">
 <td>mx1, mx2</td>
 <td>Intel x86 MP</td>
 <td>2x3.06Ghz Xeon, 1GB Memory, 80GB IDE Disk, Broadcom Gigabit Ethernet.</td>
 </tr>
 
 <tr valign="top">
 <td>ns0</td>
 <td>&nbsp;</td>
 <td>&nbsp;</td>
 </tr>
 
 <tr valign="top">
 <td>ns1, ns2</td>
 <td>Intel x86</td>
 <td>800MHz Pentium III, 1GB Memory, 40GB ATA drive,
   Intel EtherExpress Pro 10/100B NIC.</td>
 </tr>
 
 <tr valign="top">
 <td>pluto1, pluto2</td>
 <td>IA-64 MP</td>
 <td>2x900MHz Itanium2 (McKinley) - HP zx1 (pluto) chipset,
-2GB Memory (only 1GB enabled), LSILogic 1030 U320 SCSI controller (mpt),
+2GB Memory, LSILogic 1030 U320 SCSI controller (mpt),
 1x36GB 10K RPM U160 SCSI drive, Broadcom BCM5701 Gigabit NIC.</td>
 </tr>
 
 <tr valign="top">
 <td>pointyhat</td>
 <td>Intel EM64T MP</td>
 <td>2x2.8Ghz Intel Xeon (dualcore), 4GB Memory, Dell PERC 4 RAID controller,
   1.1TB storage, Intel PRO/1000 Gigabitq NIC.</td>
 </tr>
 
 <tr valign="top">
 <td>repoman</td>
 <td>AMD64 MP</td>
 <td>4x2.4GHz Opteron 280 (dual CPU, dual core), 8GB Memory,
 HP Smart Array 6i RAID controller,
 Broadcom BCM5704C Gigabit NIC.</td>
 </tr>
 
 <tr valign="top">
 <td>sky</td>
 <td>Intel x86 MP</td>
 <td>2x2.4GHz Xeon, 2GB Memory, Compaq RAID 5, Broadcom Gigabit NIC.</td>
 </tr>
 
 <tr valign="top">
 <td>sledge</td>
 <td>AMD64 MP</td>
 <td>2x1.8GHz Opteron 244, AMD 8111/8131 chipset, 8GB Memory,
 1x40GB Seagate ST340014A IDE drive, Broadcom BCM5703 Gigabit 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 MP</td>
 <td>2x600MHz Pentium III, 1GB Memory, 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 management.</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)
builder	6-STABLE	BSD/OS source holder, Build box for the FreeBSD documentation for the FTP site.	committers
freefall	7-CURRENT	GNATS/shell Logins.	committers
ftp-master	6-STABLE	FTP Master (stage server).	peter/kuriyama/obrien/steve
gohan10-17	6-STABLE/7-CURRENT	Ports Build cluster.	ports team
gohan20-39	6-STABLE/7-CURRENT	Ports Build cluster.	ports team
hub	6-STABLE	Mailing Lists and Mail services.	postmaster
mx1	6-STABLE	Inbound Mail services.	admins
mx2	6-STABLE	Outbound Mail services.	admins
ns0	6-STABLE	A FreeBSD.org authoritative DNS Server.	admins
ns1, ns2	7-CURRENT	FreeBSD.org recursive DNS Server.	clusteradm
pluto1	-CURRENT	7-STABLE	Reference machine for testing ia64 changes.	committers
pluto2	6-STABLE	-CURRENT	Reference machine for testing ia64 changes.	committers
pointyhat	-CURRENT	All architectures package build master.	ports team
repoman	6-STABLE	CVS Master repository.	admins
sky	7-CURRENT	The New www.FreeBSD.org Webserver.	committers
sledge	-CURRENT	Reference machine for testing AMD64 changes.	committers
spit (cvsup-master)	6-STABLE	CVSup master mirror.	admins
www	6-STABLE	The www.FreeBSD.org Webserver.	webmaster
Host	Type	Hardware
builder	Intel x86	800MHz Pentium III, 512MB Memory, 40GB Seagate ATA drive, Intel EtherExpress Pro 10/100B NIC.
freefall	Intel x86	2x dual-core 2.80GHz Xeon (Pentium-IV family), 2GB Memory, Compaq Smart Array 5i SCSI RAID controller, 138 GB SCSI local storage, Broadcom-based Compaq NC7781 Gigabit Server Adapter NIC.
ftp-master	Intel x86	2.66GHz Pentium 4, 1GB Memory, 40GB Maxtor ATA drive, Broadcom BCM5703 Gigabit Ethernet NIC.
gohan10-17	Intel x86	800MHz Pentium III, 512MB Memory, Intel ICH ATA66 controller, 1x30GB ATA66 drive, Intel EtherExpress Pro 10/100B NIC.
gohan20-39
hub	AMD64 MP	4x2.2Ghz (dual CPU, dual core), 3GB Memory, Adaptec RAID Controller, 4x36GB U160 SCSI Disk, Broadcom Gigabit Ethernet.
mx1, mx2	Intel x86 MP	2x3.06Ghz Xeon, 1GB Memory, 80GB IDE Disk, Broadcom Gigabit Ethernet.
ns0
ns1, ns2	Intel x86	800MHz Pentium III, 1GB Memory, 40GB ATA drive, Intel EtherExpress Pro 10/100B NIC.
pluto1, pluto2	IA-64 MP	2x900MHz Itanium2 (McKinley) - HP zx1 (pluto) chipset, -2GB Memory (only 1GB enabled), LSILogic 1030 U320 SCSI controller (mpt), +2GB Memory, LSILogic 1030 U320 SCSI controller (mpt), 1x36GB 10K RPM U160 SCSI drive, Broadcom BCM5701 Gigabit NIC.
pointyhat	Intel EM64T MP	2x2.8Ghz Intel Xeon (dualcore), 4GB Memory, Dell PERC 4 RAID controller, 1.1TB storage, Intel PRO/1000 Gigabitq NIC.
repoman	AMD64 MP	4x2.4GHz Opteron 280 (dual CPU, dual core), 8GB Memory, HP Smart Array 6i RAID controller, Broadcom BCM5704C Gigabit NIC.
sky	Intel x86 MP	2x2.4GHz Xeon, 2GB Memory, Compaq RAID 5, Broadcom Gigabit NIC.
sledge	AMD64 MP	2x1.8GHz Opteron 244, AMD 8111/8131 chipset, 8GB Memory, 1x40GB Seagate ST340014A IDE drive, Broadcom BCM5703 Gigabit NIC.
spit (cvsup-master)
www	Intel x86 MP	2x600MHz Pentium III, 1GB Memory, 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.