diff --git a/ChangeLog b/ChangeLog
index d21a4cc..3a23c4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-21  Ben Elliston  <bje@redhat.com>
+
+	* config.guess: Detect EMX on OS/2. Reported by Ilya Zakharevich
+	<ilya@math.ohio-state.edu>.
+
 2000-11-16  Ben Elliston  <bje@redhat.com>
 
 	* config.guess: Use getconf(1) on HP-UX 11.x systems (when
diff --git a/config.guess b/config.guess
index 5432d58..8247fa1 100755
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
 #   Free Software Foundation, Inc.
 
-version='2000-11-16'
+version='2000-11-21'
 
 # 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
@@ -1157,6 +1157,11 @@ EOF
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
 	exit 0 ;;
+    i?86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2