diff --git a/ChangeLog b/ChangeLog
index d833d8c..de78215 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-27  Ben Elliston  <bje@gnu.org>
+
+	* config.guess (i*:windows32*:*): uname -m includes "-pc", so no
+	need to emit it additionally.
+	* testsuite/config-guess.data: Update test case.
+
 2005-05-15  Ben Elliston  <bje@gnu.org>
 
 	Reported by Sam Steingold <sds@gnu.org>:
diff --git a/config.guess b/config.guess
index 21a7ad8..6d71f75 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-05-15'
+timestamp='2005-05-27'
 
 # 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
@@ -805,9 +805,13 @@ EOF
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
-    i*:MINGW*:* | i*:windows32*:*)
+    i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+    i*:windows32*:*)
+    	# uname -m includes "-pc" on this system.
+    	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index f75816b..35eeaeb 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -9,4 +9,4 @@ i386	ignored			VOS		ignored	i386-stratus-vos
 arm	ignored			RISCOS		ignored	arm-unknown-riscos
 arm	ignored			riscos		ignored	arm-unknown-riscos
 i586	5.0.0			skyos		ignored	i586-pc-skyos5.0.0
-i786	ignored			windows32	ignored	i786-pc-mingw32
+i786-pc	ignored			windows32	ignored	i786-pc-mingw32