diff --git a/ChangeLog b/ChangeLog
index 6bea78f..d50786f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-23  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* config.guess (i*86:Linux:*:*): Recognise the Sun Studio compiler
+	by handling #if defined(__sun).
+
 2006-02-23  Ben Elliston  <bje@gnu.org>
 
 	* config.guess: Handle i*:MSYS_NT-*:*:* for MSYS/Mingw.
diff --git a/config.guess b/config.guess
index 37c1d10..dd7bf87 100755
--- a/config.guess
+++ b/config.guess
@@ -986,7 +986,7 @@ EOF
 	LIBC=gnulibc1
 	# endif
 	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI)
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout