diff --git a/ChangeLog b/ChangeLog
index 34d8cb0..d9e2859 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-12  Alexander Deynichenko <adeynichenko@gmail.com>
+	    Ben Elliston  <bje@gnu.org>
+
+	* config.guess (BePC:Haiku*:*): New.
+	* testsuite/config-guess.data: Add test case.
+
 2008-03-08  Ben Elliston  <bje@gnu.org>
 
 	From Chris Metcalf <cmetcalf@tilera.com>:
diff --git a/config.guess b/config.guess
index f32079a..6603908 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 
-timestamp='2008-01-23'
+timestamp='2008-03-12'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -1216,6 +1216,9 @@ EOF
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index 7b0dba7..f00f672 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -33,3 +33,4 @@ i386	1.0			MINGW		ignored	i386-pc-mingw32
 SX-8R	1.0			SUPER-UX	ignored	sx8r-nec-superux1.0
 i86xen	5.6			SunOS		ignored	i386-pc-solaris2.6
 IA64	6.0			Interix		ignored	ia64-unknown-interix6.0
+BePC	1.0			Haiku		ignore	i586-pc-haiku