diff --git a/en/platforms/index.sgml b/en/platforms/index.sgml
index 159adf568d..0babbcdab6 100644
--- a/en/platforms/index.sgml
+++ b/en/platforms/index.sgml
@@ -1,59 +1,59 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "..">
 <!ENTITY email 'freebsd-www'>
 <!ENTITY title "Supported Platforms">
-<!ENTITY date "$FreeBSD: www/en/platforms/index.sgml,v 1.6 2002/11/08 14:56:49 jmallett Exp $">
+<!ENTITY date "$FreeBSD: www/en/platforms/index.sgml,v 1.7 2003/01/20 00:06:00 marcel Exp $">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;]>
 
 <html>
   &header;
 
   <h2>Introduction</h2>
 
   <p>Here you will find a list of platforms that FreeBSD currently
     supports along with platforms currently being ported to (with the
     exception of x86, since most of the information on the remainder of
     the site already pertains to that platform).</p>
 
   <h2>Table of Contents</h2>
 
   <ul>
     <li><a href="alpha.html">FreeBSD/alpha Project</a></li>
     <li><a href="ia64/index.html">FreeBSD/ia64 Project</a></li>
     <li><a href="mips.html">FreeBSD/MIPS Project</a></li>
     <li><a href="ppc.html">FreeBSD/ppc Project</a></li>
     <li><a href="sparc.html">FreeBSD/sparc64 Project</a></li>
-    <li><a href="x86-64.html">FreeBSD/x86-64 Project</a></li>
+    <li><a href="x86-64.html">FreeBSD/amd64 Project</a></li>
   </ul>
 
   <h2>Comments and Feedback</h2>
 
   <p>If you have comments about a port, or wish to provide feedback to
     the developers, send it the relevant mailing list.  The lists
     are:</p>
 
   <ul>
     <li>For the FreeBSD/alpha port, <a
       href="mailto:freebsd-alpha@FreeBSD.org">freebsd-alpha@FreeBSD.org</a></li>
 
     <li>For the FreeBSD/ia64 port, <a
       href="mailto:freebsd-ia64@FreeBSD.org">freebsd-ia64@FreeBSD.org</a></li>
 
     <li>For the FreeBSD/MIPS port, <a
       href="mailto:freebsd-mips@FreeBSD.org">freebsd-mips@FreeBSD.org</a></li>
 
     <li>For the FreeBSD/ppc port, <a
       href="mailto:freebsd-ppc@FreeBSD.org">freebsd-ppc@FreeBSD.org</a></li>
 
     <li>For the FreeBSD/sparc64 port, <a
       href="mailto:freebsd-sparc@FreeBSD.org">freebsd-sparc@FreeBSD.org</a></li>
 
-    <li>For the FreeBSD/x86-64 port, <a
-      href="mailto:freebsd-hackers@FreeBSD.org">freebsd-hackers@FreeBSD.org</a></li>
+    <li>For the FreeBSD/amd64 port, <a
+      href="mailto:freebsd-amd64@FreeBSD.org">freebsd-amd64@FreeBSD.org</a></li>
 
     <li>For general architecture questions, <a
       href="mailto:freebsd-arch@FreeBSD.org">freebsd-arch@FreeBSD.org</a></li>
   </ul>
 
   &footer;
 </html>
diff --git a/en/platforms/x86-64.sgml b/en/platforms/x86-64.sgml
index 5571091084..265ac0237e 100644
--- a/en/platforms/x86-64.sgml
+++ b/en/platforms/x86-64.sgml
@@ -1,54 +1,54 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/platforms/x86-64.sgml,v 1.11 2002/03/16 08:11:16 murray Exp $">
-<!ENTITY title "FreeBSD/x86-64 Project">
-<!ENTITY email 'freebsd-hackers'>
+<!ENTITY date "$FreeBSD: www/en/platforms/x86-64.sgml,v 1.12 2003/05/08 15:37:26 obrien Exp $">
+<!ENTITY title "FreeBSD/amd64 Project">
+<!ENTITY email 'freebsd-amd64'>
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
  
 <html>
 &header;
 
 <a href="../gifs/daemon_hammer.jpg"><IMG SRC="../gifs/daemon_hammer-tn15.jpg" ALIGN=right BORDER=0 ALT="BSD Daemon swinging a sledge hammer"></A>
 
 <p>This page contains information about porting FreeBSD to AMD's
 upcoming x86-64 ``Hammer'' architecture.</p>
 
 <h3>Latest News</h3>
 
 <h3>What needs to be done</h3>
 <p><a href="http://www.x86-64.org/downloads/">AMD's SimNow! x86-64
 simulator</a> is currently less than ideal for FreeBSD development due to
 its slowness.</p>
 
-<H3>FreeBSD/x86-64 Specific Links</H3>
+<H3>FreeBSD/amd64 Specific Links</H3>
 <UL>
-<LI><A HREF="mailto:hackers@FreeBSD.org">FreeBSD/x86-64 mailing list</A></LI>
+<LI><A HREF="mailto:freebsd-amd64@FreeBSD.org">FreeBSD/amd64 mailing list</A></LI>
 </UL>
 
 <H3>Other Links of Interest</H3>
 <H4>x86-64 Documentation</H4>
 <UL>
 <li><a href="http://www.amd.com/products/cpg/64bit/pdf/x86-64_overview.pdf">
 AMD x86-64 Architecture Specification</a></li>
 <li><a href="http://www.x86-64.org/abi.pdf">
 AMD x86-64 DRAFT Processor-specific Application Binary Interface Specification</a></li>
 <li><a href="http://www.x86-64.org/documentation_folder/white_paper.pdf">
 AMD x86-64 whitepaper</a></li>
 </UL>
 
 <H4>Software Tools</h4>
 <ul>
 <li><a href="http://www.x86-64.org/downloads">AMD SimNow! x86-64 Linux
 Simulator and Tools</a></li>
 </ul>
 
 <H4>Related Projects</H4>
 <UL>
 <LI><A HREF="http://www.x86-64.org/kernel_folder/kernel">Linux / x86-64</A></LI>
-<LI><A HREF="http://www.NetBSD.org/Ports/x86_64/">NetBSD/x86_64</A></LI>
+<LI><A HREF="http://www.NetBSD.org/Ports/amd64/">NetBSD/amd64</A></LI>
 </UL>
 
 &footer;
 </body>
 </html>
