diff --git a/ChangeLog b/ChangeLog
index 06319d0791..3020d7a799 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Sun Aug 10 12:29:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Aug 10 12:34:41 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* config.guess ({powerpc-apple,i586-pc}-haiku): re-applied r18403.
+	  [ruby-core:18110]
 
 	* config.{guess,sub}: updated to automake-1.10.1.
 
diff --git a/config.guess b/config.guess
index ca2a03ca4f..5186e37f44 100644
--- 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-08'
+timestamp='2008-08-10'
 
 # 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,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 ;;