diff --git a/ChangeLog b/ChangeLog
index 1446ead..cbd84b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-07-31  Mark Kettenis  <kettenis@gnu.org>
+
+	* config.guess: Restore detection of libc version for x86
+	Linux/GNU ELF systems, but fall back on tentative name based on ld
+	emulation.  Use i?86-pc-linux-gnu as tentative name since that's
+	the canonical name.
+
 2000-07-27  Ben Elliston  <bje@redhat.com>
 
 	* config.sub: Use "unknown" for the manufacturer field of Amiga
diff --git a/config.guess b/config.guess
index 646ae05..81688c4 100755
--- a/config.guess
+++ b/config.guess
@@ -712,8 +712,7 @@ EOF
 		exit 0
 		;;
 	  elf_i?86)
-		echo "${UNAME_MACHINE}-pc-linux"
-		exit 0
+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 		;;
 	  i?86coff)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
@@ -900,6 +899,7 @@ EOF
 EOF
 	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
 	  rm -f $dummy.c $dummy
+	  test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	fi ;;
 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
 # are messed up and put the nodename in both sysname and nodename.