diff --git a/ChangeLog b/ChangeLog
index ae0aa46..8624371 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-02-23  Ben Elliston  <bje@gnu.org>
+
+	* config.guess (EM64T:Interix:*:*): New case.
+	* testsuite/config-guess.data: Add test case.
+
+2006-02-23  Mike Frysinger  <vapier@gentoo.org>
+
+	* config.sub (nios, nios2): New.
+	* testsuite/config-sub.data: Add test cases.
+
 2006-02-23  Ben Elliston  <bje@gnu.org>
 
 	* config.guess (x86:Interix*:[345]*): Retain full Interix version.
diff --git a/config.guess b/config.guess
index f35f76c..c38553d 100755
--- a/config.guess
+++ b/config.guess
@@ -793,6 +793,9 @@ EOF
     x86:Interix*:[345]*)
 	echo i586-pc-interix${UNAME_RELEASE}
 	exit ;;
+    EM64T:Interix*:[345]*)
+	echo x86_64-unknown-interix${UNAME_RELEASE}
+	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
diff --git a/config.sub b/config.sub
index a4e8a94..ad9f395 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, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2006-01-02'
+timestamp='2006-02-23'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -268,6 +268,7 @@ case $basic_machine in
 	| mn10200 | mn10300 \
 	| mt \
 	| msp430 \
+	| nios | nios2 \
 	| ns16k | ns32k \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
@@ -350,6 +351,7 @@ case $basic_machine in
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
+	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index cb2a338..156685d 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -20,3 +20,4 @@ pc98	7.0			FreeBSD		ignored	i386-unknown-freebsd7.0
 i586	1.0			SolidBSD	ignored	i586-unknown-solidbsd1.0
 i686	5.4-1-686		GNU/kFreeBSD	ignored	i686-unknown-kfreebsd5.4-gnu
 i686	1.0.10(0.46/3/2)	MSYS_NT-5.1	ignored	i686-pc-mingw32
+EM64T	5.2			Interix		ignored	x86_64-unknown-interix5.2
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 2d7c0db..49ecf8c 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -82,3 +82,7 @@ mb-elf				mb-unknown-elf
 microblaze-elf			microblaze-unknown-elf
 i386-solidbsd			i386-pc-solidbsd
 amd64-kfreebsd5.4-gnu		x86_64-pc-kfreebsd5.4-gnu
+nios				nios-unknown-none
+nios2				nios2-unknown-none
+nios-elf			nios-unknown-elf
+nios2-elf			nios2-unknown-elf