diff --git a/ChangeLog b/ChangeLog
index 13df57b..7cbac4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-26  Andy Olson  <andrew.olson@lmco.com>
+
+	* config.guess (*:QNX:*:*): Report i386-* rather than x86pc-*.
+	Discussed with and approved by <peterv@qnx.com>.
+
 2002-01-23  Ben Elliston  <bje@redhat.com>
 
 	* config.guess (i*86:Linux:*:*): Specifically handle the Intel icc
diff --git a/config.guess b/config.guess
index c2801e9..52c5acf 100755
--- a/config.guess
+++ b/config.guess
@@ -1067,8 +1067,10 @@ EOF
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	if test "${UNAME_MACHINE}" = "x86pc"; then
 		UNAME_MACHINE=pc
+		echo i386-${UNAME_MACHINE}-nto-qnx
+	else
+		echo `uname -p`-${UNAME_MACHINE}-nto-qnx
 	fi
-	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
 	exit 0 ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx