diff --git a/ChangeLog b/ChangeLog
index fe85ab9..19eea60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-02  Ben Elliston  <bje@gnu.org>
+
+	* config.guess: Handle Interix 6.
+	* testsuite/config-guess.data: Add test case.
+
 2006-06-06  Ben Elliston  <bje@gnu.org>
 
 	From H??vard Skinnemoen <hskinnemoen@atmel.com>:
diff --git a/config.guess b/config.guess
index 7924ac0..0b0329f 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-06-06'
+timestamp='2006-07-02'
 
 # 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
@@ -790,10 +790,10 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[345]*)
+    x86:Interix*:[3456]*)
 	echo i586-pc-interix${UNAME_RELEASE}
 	exit ;;
-    EM64T:Interix*:[345]*)
+    EM64T: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 032eeac..6232896 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -22,3 +22,4 @@ i686	5.4-1-686		GNU/kFreeBSD	ignored	i686-unknown-kfreebsd5.4-gnu
 EM64T	5.2			Interix		ignored	x86_64-unknown-interix5.2
 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