diff --git a/ChangeLog b/ChangeLog
index 6cc0ce1cd33a5b9f2ce0491f3713825e06a14824..d6f8c35e903ee4c3c90f6305ad6a190fa916bb92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Dec 11 23:30:51 1997  Fred Fish  <fnf@ninemoons.com>
+
+	* config.guess: Add BeOS support.
+
 Wed Dec  3 07:55:59 1997  Jeffrey A Law  (law@cygnus.com)
 
 	* configure (gxx_include_dir): Fix thinko.
diff --git a/config.guess b/config.guess
index 34d431b91830cc8c4a9de81648f23c85c3200cc5..0c31bbb67af2cac3cfa5cb521e886f1044c171e4 100755
--- a/config.guess
+++ b/config.guess
@@ -771,6 +771,12 @@ EOF
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
         exit 0 ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit 0 ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2