diff --git a/ChangeLog b/ChangeLog
index c563244..b907fee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-24  Ben Elliston  <bje@redhat.com>
+
+	* config.guess: Match Linux x86 systems explicitly.  Allow unknown
+	architectures to fall through to the default case.
+
 2001-02-23  Ben Elliston  <bje@redhat.com>
 
 	* config.guess: More Linux cleanup. Match more in the top-level
diff --git a/config.guess b/config.guess
index 0c9c875..8665530 100755
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 
-timestamp='2001-02-23'
+timestamp='2001-02-24'
 
 # 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
@@ -876,7 +876,7 @@ EOF
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit 0 ;;
-    *:Linux:*:*)
+    i?86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
 	# problems with other programs or directories called `ld' in the path.
@@ -899,15 +899,12 @@ EOF
 		exit 0
 		;;
 	esac
-
 	# Either a pre-BFD a.out linker (linux-gnuoldld)
 	# or one that does not give us useful --help.
 	# GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
 	# If ld does not provide *any* "supported emulations:"
 	# that means it is gnuoldld.
-	test -z "$ld_supported_emulations" \
-	  && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
-
+	test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
 	case "${UNAME_MACHINE}" in
 	i?86)
 	  VENDOR=pc;