diff --git a/autoconf/build-aux/config.guess b/autoconf/build-aux/config.guess
index eeb9aef181..e291ac650e 100755
--- a/autoconf/build-aux/config.guess
+++ b/autoconf/build-aux/config.guess
@@ -1200,6 +1200,12 @@ EOF
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit ;;
+    BeMac:Haiku:*:*)
+	echo powerpc-apple-haiku
+	exit ;;
+    BePC:Haiku:*:*)
+	echo i586-pc-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;