diff --git a/ChangeLog b/ChangeLog
index 7c26b89..8571c27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-14  Alex Smith  <alex@alex-smith.me.uk>
+
+	* config.guess (x86_64:Haiku:*:*): New.
+	* testsuite/config-guess.data: Add a test case.
+
 2012-07-31  Ben Elliston  <bje@gnu.org>
 
 	* testsuite/config-guess.sh: Don't export PATH.
diff --git a/config.guess b/config.guess
index ad5f74a..137bedf 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2012-07-31'
+timestamp='2012-08-14'
 
 # 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
@@ -1208,6 +1208,9 @@ EOF
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	echo i586-pc-haiku
 	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-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 84557cd..d4c173f 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -55,4 +55,5 @@ x86_64	1.0			MINGW64		ignored	x86_64-pc-mingw64
 x86_64	2.6.32			Linux		ignored	x86_64-unknown-linux-gnu
 x86_64	2.6.32			VMkernel	ignored	x86_64-unknown-esx
 x86_64	1.5.18(0.132/4/2)	CYGWIN_NT-5.2	ignored	x86_64-unknown-cygwin
+x86_64	1.0			Haiku		ignored	x86_64-unknown-haiku
 xtensa	2.6.15			Linux		ignored	xtensa-unknown-linux-gnu