diff --git a/tools/setup.lisp b/tools/setup.lisp
index d4bb07695ee10e71396b428c0e4d3be314c8c3f0..d828284db9a72f9cedd275a8f56c7e9281e0e75d 100644
--- a/tools/setup.lisp
+++ b/tools/setup.lisp
@@ -3,7 +3,7 @@
 ;;; **********************************************************************
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/setup.lisp,v 1.38 2003/07/20 13:57:24 emarsden Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/setup.lisp,v 1.39 2004/06/01 23:36:07 cwang Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -302,12 +302,13 @@
 	  ((c:target-featurep :alpha) "alpha/")
 	  ((c:target-featurep :sgi) "mips/")
 	  ((c:target-featurep :ppc) "ppc/")
+	  ((c:target-featurep :amd64) "amd64/")
 	  (t
 	   (error "What machine is this?")))
     (make-pathname :directory (pathname-directory f)))))
 
 
-;;; CAT-IF-ANYTHING-CHAGNED
+;;; CAT-IF-ANYTHING-CHANGED
 
 (defun cat-if-anything-changed (output-file &rest input-files)
   (flet ((add-correct-type (pathname)
diff --git a/tools/worldbuild.lisp b/tools/worldbuild.lisp
index c37de3133053475129333ad6125e3632360d78b2..23ef2928ad72a23d7da68327df903874e7e52486 100644
--- a/tools/worldbuild.lisp
+++ b/tools/worldbuild.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/worldbuild.lisp,v 1.50 2003/09/08 16:07:04 toy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/worldbuild.lisp,v 1.51 2004/06/01 23:37:45 cwang Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -47,6 +47,11 @@
 	  "target:assembly/x86/array.assem"
 	  "target:assembly/x86/arith.assem"
 	  "target:assembly/x86/alloc.assem"))
+    ,@(when (c:backend-featurep :amd64)
+	'("target:assembly/amd64/assem-rtns.assem"
+	  "target:assembly/amd64/array.assem"
+	  "target:assembly/amd64/arith.assem"
+	  "target:assembly/amd64/alloc.assem"))
     ,@(when (c:backend-featurep :alpha)
 	'("target:assembly/alpha/assem-rtns.assem"
 	  "target:assembly/alpha/array.assem"
@@ -159,6 +164,8 @@
 	'("target:code/hppa-vm"))
     ,@(when (c:backend-featurep :x86)
 	'("target:code/x86-vm"))
+    ,@(when (c:backend-featurep :amd64)
+	'("target:code/amd64-vm"))
     ,@(when (c:backend-featurep :alpha)
 	'("target:code/alpha-vm"))
     ,@(when (c:backend-featurep :sgi)
diff --git a/tools/worldcom.lisp b/tools/worldcom.lisp
index 35598e23746d3aa6dcdf0dff1062f0953cf0a2e4..cc0de6138230d3a6adf4dcd0a690341e91d63947 100644
--- a/tools/worldcom.lisp
+++ b/tools/worldcom.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/worldcom.lisp,v 1.91 2004/01/09 04:34:18 toy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/worldcom.lisp,v 1.92 2004/06/01 23:40:09 cwang Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -82,6 +82,12 @@
   (comf "target:assembly/x86/arith" :assem t)
   (comf "target:assembly/x86/alloc" :assem t))
 
+(when (c:backend-featurep :amd64)
+  (comf "target:assembly/amd64/assem-rtns" :assem t)
+  (comf "target:assembly/amd64/array" :assem t)
+  (comf "target:assembly/amd64/arith" :assem t)
+  (comf "target:assembly/amd64/alloc" :assem t))
+
 (when (c:backend-featurep :alpha)
   (comf "target:assembly/alpha/assem-rtns" :assem t)
   (comf "target:assembly/alpha/array" :assem t)
@@ -180,6 +186,8 @@
   (comf "target:code/hppa-vm"))
 (when (c:backend-featurep :x86)
   (comf "target:code/x86-vm"))
+(when (c:backend-featurep :amd64)
+  (comf "target:code/amd64-vm"))
 (when (c:backend-featurep :alpha)
   (comf "target:code/alpha-vm"))
 (when (c:backend-featurep :sgi)
diff --git a/tools/worldload.lisp b/tools/worldload.lisp
index aa97a4665d6fc5fe8ba218df381ef36eef2b603f..623f076e11ef84461810d006fdbe6aa9120303a3 100644
--- a/tools/worldload.lisp
+++ b/tools/worldload.lisp
@@ -6,7 +6,7 @@
 ;;; If you want to use this code or any part of CMU Common Lisp, please contact
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/worldload.lisp,v 1.102 2004/01/09 04:34:18 toy Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/worldload.lisp,v 1.103 2004/06/01 23:43:03 cwang Exp $
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -62,6 +62,7 @@
 	#+rt "c:rt/"
 	#+hppa "c:hppa/"
 	#+x86 "c:x86/"
+	#+amd64 "c:amd64/"
 	#+alpha "c:alpha/"
 	#+ppc "c:ppc/"
 	"c:generic/"))
@@ -71,6 +72,7 @@
 	#+rt "target:assembly/rt/"
 	#+hppa "target:assembly/hppa/"
 	#+x86 "target:assembly/x86/"
+	#+amd64 "target:assembly/amd64/"
 	#+alpha "target:assembly/alpha/"
 	#+ppc "target:assembly/ppc/"
 	"target:assembly/"))
@@ -92,6 +94,8 @@
 (rename-package "RT" "RT" '("VM" "OLD-RT"))
 #+x86
 (rename-package "X86" "X86" '("VM" "OLD-X86"))
+#+amd64
+(rename-package "AMD64" "AMD64" '("VM" "OLD-AMD64"))
 #+hppa
 (rename-package "HPPA" "HPPA" '("VM" "OLD-HPPA"))
 #+alpha