diff --git a/autoconf/config/config.guess b/autoconf/config/config.guess
index 500ee74b04..6356b911c3 100755
--- a/autoconf/config/config.guess
+++ b/autoconf/config/config.guess
@@ -1134,6 +1134,12 @@ EOF
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit 0 ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit 0 ;;
+    BeMac:Haiku:*:*)	# Haiku running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-haiku
+	exit 0 ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit 0 ;;
diff --git a/autoconf/config/config.sub b/autoconf/config/config.sub
index 1f31816b97..98b1c94861 100755
--- a/autoconf/config/config.sub
+++ b/autoconf/config/config.sub
@@ -1143,7 +1143,7 @@ case $os in
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -haiku*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)