diff --git a/ChangeLog b/ChangeLog
index fb92167..8f47da4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-16  Mike Frysinger  <vapier@gentoo.org>
+
+	* config.guess (s390:Linux:*:*|s390x:Linux:*:*): s390 targets
+	include "-gnu" suffixes like other Linux targets (and "-uclibc"
+	with uclibc targets).
+
 2013-05-16  Mike Frysinger  <vapier@gentoo.org>
 
 	* config.guess: Hoist C library detection code up to a common
diff --git a/config.guess b/config.guess
index 821b25a..120cc0d 100755
--- a/config.guess
+++ b/config.guess
@@ -996,7 +996,7 @@ EOF
 	echo powerpc-unknown-linux-${LIBC}
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
     sh64*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}