--- fish-2.1.2/config.guess.orig	2015-05-07 10:50:52.817400000 +0300
+++ fish-2.1.2/config.guess	2015-05-07 10:51:53.610600000 +0300
@@ -844,6 +844,9 @@
     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
 	echo x86_64-unknown-cygwin
 	exit ;;
+    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
+	echo x86_64-unknown-msys
+	exit ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin
 	exit ;;