diff --git a/ChangeLog b/ChangeLog
index 2c6a5da..ba5cf09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-14  Robert Millan  <robertmh@gnu.org>
+
+	* config.guess (or32:Linux:*:*): Detect.
+	* testsuite/config-guess.data: Add test case.
+
 2005-07-08  Michael Haubenwallner  <michael.haubenwallner@salomon.at>
 
 	* config.guess: Let set_cc_for_build evaluate only once to avoid
diff --git a/config.guess b/config.guess
index 917bbc5..480b123 100755
--- a/config.guess
+++ b/config.guess
@@ -873,6 +873,9 @@ EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
+    or32:Linux:*:*)
+	echo or32-unknown-linux-gnu
+	exit ;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
 	exit ;;
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index 35eeaeb..c9fdc64 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -10,3 +10,4 @@ arm	ignored			RISCOS		ignored	arm-unknown-riscos
 arm	ignored			riscos		ignored	arm-unknown-riscos
 i586	5.0.0			skyos		ignored	i586-pc-skyos5.0.0
 i786-pc	ignored			windows32	ignored	i786-pc-mingw32
+or32	ignored			Linux		ignored	or32-unknown-linux-gnu