diff --git a/ChangeLog b/ChangeLog
index 2e18efa..281cbe1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-08  Ben Elliston  <bje@gnu.org>
+
+	* config.guess (authenticamd:Interix*:[3456]*): Another AMD64.
+	* testsuite/config-guess.data: Add test case.
+
 2006-11-07  Steve Woodford  <scw@NetBSD.org>
 	    Ben Elliston  <bje@gnu.org>
 
diff --git a/config.guess b/config.guess
index 0d30617..c93201a 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-11-07'
+timestamp='2006-11-08'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -794,7 +794,7 @@ EOF
     x86:Interix*:[3456]*)
 	echo i586-pc-interix${UNAME_RELEASE}
 	exit ;;
-    EM64T:Interix*:[3456]*)
+    EM64T:Interix*:[3456]* | authenticamd:Interix*:[3456]*)
 	echo x86_64-unknown-interix${UNAME_RELEASE}
 	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index 204f5c7..82729e6 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -24,3 +24,4 @@ amd64	5.2			FreeBSD		ignored	x86_64-unknown-freebsd5.2
 avr32	2.6.15			Linux		ignored	avr32-unknown-linux-gnu
 x86	6.0			Interix		ignored	i586-pc-interix6.0
 macppc	1.0			MirBSD		ignored	powerpc-unknown-mirbsd1.0
+authenticamd	6.0		Interix		ignored	x86_64-unknown-interix6.0