diff --git a/ChangeLog b/ChangeLog
index bac2206..4712c6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-13  Ben Elliston  <bje@gnu.org>
+
+	Reported by Dejan Lekic <dejan.lekic@gmail.com>.
+	* config.guess (*:MSYS*:*): Match all machines, not just i*.
+	* testsuite/config-guess.data: Add a test case.
+
 2014-02-12  Urs Janssen  <urs@akk.org>
 
 	* config.guess (Linux|GNU|GNU/*): Strip extraneous whitespace
diff --git a/config.guess b/config.guess
index 72625d4..71f8f7a 100755
--- a/config.guess
+++ b/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2014-02-12'
+timestamp='2014-03-13'
 
 # 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
@@ -826,7 +826,7 @@ EOF
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
-    i*:MSYS*:*)
+    *:MSYS*:*)
 	echo ${UNAME_MACHINE}-pc-msys
 	exit ;;
     i*:windows32*:*)
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index a789be4..a7ef61e 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -58,6 +58,7 @@ x86_64	1.0			Haiku		ignored	x86_64-unknown-haiku
 x86_64	1.0			MINGW64		ignored	x86_64-pc-mingw64
 x86_64	1.0			MINGW		ignored	x86_64-pc-mingw32
 x86_64	1.5.18(0.132/4/2)	CYGWIN_NT-5.2	ignored	x86_64-unknown-cygwin
+x86_64	2.0.0(0.271/5/3)	MSYS_NT-6.1	ignored	x86_64-pc-msys
 x86_64	2.6.32			Linux		ignored	x86_64-unknown-linux-gnu
 x86_64	2.6.32			VMkernel	ignored	x86_64-unknown-esx
 xtensa	2.6.15			Linux		ignored	xtensa-unknown-linux-gnu