diff --git a/ChangeLog b/ChangeLog
index 6666c83..652d686 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-09-26  Ben Elliston  <bje@gnu.org>
+
+	* config.guess: Output a note that a C compiler may be needed when
+	guessing fails on MIPS GNU/Linux systems.
+
 2017-09-26  Ben Elliston  <bje@gnu.org>
 
 	* config.guess (Local variables): Use 'write-file-functions
diff --git a/config.guess b/config.guess
index 79c859b..ba1c143 100755
--- a/config.guess
+++ b/config.guess
@@ -1400,8 +1400,20 @@ EOF
 	exit ;;
 esac
 
+echo "$0: unable to guess system type" >&2
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}" in
+    mips:Linux | mips64:Linux)
+	# If we got here on MIPS GNU/Linux, output extra information.
+	cat >&2 <<EOF
+
+NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
+the system type. Please install a C compiler and try again.
+EOF
+	;;
+esac
+
 cat >&2 <<EOF
-$0: unable to guess system type
 
 This script (version $timestamp), has failed to recognize the
 operating system you are using. If your script is old, overwrite *all*