diff --git a/ChangeLog b/ChangeLog
index 8704608..13df57b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-23  Ben Elliston  <bje@redhat.com>
+
+	* config.guess (i*86:Linux:*:*): Specifically handle the Intel icc
+	compiler, which doesn't define __ELF__.  Submitted by Erik Lindahl
+	<lindahl@stanford.edu>.
+
 2002-01-22  Nicola Pero  <nicola@brainstorm.co.uk>
 
 	* config.guess (i*86:Linux:*:*): Fixed: export LANG=C before
diff --git a/config.guess b/config.guess
index 8fb1519..c2801e9 100755
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002 Free Software Foundation, Inc.
 
-timestamp='2002-01-22'
+timestamp='2002-01-23'
 
 # 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,8 +876,12 @@ EOF
 	LIBC=gnulibc1
 	# endif
 	#else
+	#ifdef __INTEL_COMPILER
+	LIBC=gnu
+	#else
 	LIBC=gnuaout
 	#endif
+	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
 	rm -f $dummy.c