diff --git a/ChangeLog b/ChangeLog
index 6bf3f93..93b8eb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-24  Jim Pryor  <dubiousjim@gmail.com>
+
+	* config.guess (i*86:Linux:*:*): Test for uClibc.
+
 2013-04-24  Jim Pryor  <dubiousjim@gmail.com>
 
        * config.guess (x86_64:Linux:*:*): Test for uClibc.
diff --git a/config.guess b/config.guess
index 36bcfcd..d03c1ab 100755
--- a/config.guess
+++ b/config.guess
@@ -921,6 +921,11 @@ EOF
 	#ifdef __dietlibc__
 	LIBC=dietlibc
 	#endif
+	#else
+	#include <features.h>
+	#ifdef __UCLIBC__
+	LIBC=uclibc
+	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
 	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"