diff --git a/ChangeLog b/ChangeLog
index d50786f..ae0aa46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-02-23  Ben Elliston  <bje@gnu.org>
+
+	* config.guess (x86:Interix*:[345]*): Retain full Interix version.
+	* testsuite/config-guess.data: Update Interix test(s).
+
+2006-02-23  Ben Elliston  <bje@gnu.org>
+
+	* testsuite/config-guess.data: Tweak MSYS_NT-5.1 test.
+
 2006-02-23  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* config.guess (i*86:Linux:*:*): Recognise the Sun Studio compiler
diff --git a/config.guess b/config.guess
index dd7bf87..f35f76c 100755
--- a/config.guess
+++ b/config.guess
@@ -791,7 +791,7 @@ EOF
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
     x86:Interix*:[345]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+	echo i586-pc-interix${UNAME_RELEASE}
 	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index 0f3830d..cb2a338 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -12,11 +12,11 @@ i586	5.0.0			skyos		ignored	i586-pc-skyos5.0.0
 i786-pc	ignored			windows32	ignored	i786-pc-mingw32
 or32	ignored			Linux		ignored	or32-unknown-linux-gnu
 x86_64	1.5.18(0.132/4/2)	CYGWIN_NT-5.2	ignored	x86_64-unknown-cygwin
-x86	5.0			Interix		ignored	i586-pc-interix5
+x86	5.2			Interix		ignored	i586-pc-interix5.2
 ppc64	2.6.9-22		Linux		ignored	powerpc64-unknown-linux-gnu
 vax	2.6.15			Linux		ignored	vax-dec-linux-gnu
 i586	ignored			rdos		ignored	i586-pc-rdos
 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-mingw
+i686	1.0.10(0.46/3/2)	MSYS_NT-5.1	ignored	i686-pc-mingw32