diff --git a/ChangeLog b/ChangeLog
index ada4138..12acc1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-11  Ben Elliston  <bje@gnu.org>
+
+	* config.guess (x86:Interix*:[345]*): Handle Interix version 5.
+	* testsuite/config-guess.data: Add test case.
+
 2005-09-19  Gerben Wierda <Gerben.Wierda@rna.nl>
 
 	* config.guess (*:Darwin:*:*): Don't treat *86 specifically.
diff --git a/config.guess b/config.guess
index d0d57f6..52c01be 100755
--- a/config.guess
+++ b/config.guess
@@ -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='2005-09-19'
+timestamp='2005-11-11'
 
 # 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
@@ -779,7 +779,7 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[34]*)
+    x86:Interix*:[345]*)
 	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
 	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 ecf58ea..2354809 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -12,3 +12,4 @@ 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