diff --git a/build/autoconf/config.guess b/build/autoconf/config.guess
index b5b5e971cf15..0917917b1ee9 100755
--- a/build/autoconf/config.guess
+++ b/build/autoconf/config.guess
@@ -756,6 +756,15 @@ EOF
     *:QNX:*:*)
 	echo i386-pc-qnx`${UNAME_VERSION} | cut -c1-1`
 	exit 0 ;;
+    BePC:BeOS:*:*)
+        echo i386-pc-beos${UNAME_RELEASE}
+        exit 0 ;;
+    BeMac:BeOS:*:*)
+        echo ppc-apple-beos${UNAME_RELEASE}
+        exit 0 ;;
+    BeBox:BeOS:*:*)
+        echo ppc-be-beos${UNAME_RELEASE}
+        exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
index ee769e89f59a..3ee5b671cef0 100755
--- a/build/autoconf/config.sub
+++ b/build/autoconf/config.sub
@@ -737,6 +737,9 @@ case $os in
 	      | -mingw32* | -linux-gnu* | -uxpv*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
+	-beos*)
+		os=-beos
+		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;