diff --git a/ChangeLog b/ChangeLog
index c892f81..0cc935b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-05  Ben Elliston  <bje@wasabisystems.com>
+
+	* config.sub: Handle amd64-*.
+
 2003-11-20  Kristian Van Der Vliet  <vanders@liqwyd.com>
 
 	* config.guess (i*86:syllable:*:*): New.
diff --git a/config.sub b/config.sub
index fac5195..463186d 100755
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2003-11-20'
+timestamp='2004-01-05'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -380,6 +380,9 @@ case $basic_machine in
 	amd64)
 		basic_machine=x86_64-pc
 		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv