diff --git a/ChangeLog b/ChangeLog
index 7bc57d93f8..3c56e98a11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 13 16:05:50 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_cmp): retry with right hand operand if its not a
+	  time object.  [ruby-dev:35011]
+
 Wed Aug 13 15:51:22 2008  Akinori MUSHA  <knu@iDaemons.org>
 
 	* string.c: Apply a temporary fix to fix build on OS X.  A real
diff --git a/time.c b/time.c
index fdf465ceb8..236c2e9683 100644
--- a/time.c
+++ b/time.c
@@ -1087,8 +1087,18 @@ time_cmp(VALUE time1, VALUE time2)
 	if (tobj1->ts.tv_sec > tobj2->ts.tv_sec) return INT2FIX(1);
 	return INT2FIX(-1);
     }
+    else {
+	VALUE cmp;
+	int n;
 
-    return Qnil;
+	cmp = rb_funcall(time2, rb_intern("<=>"), 1, time1);
+	if (NIL_P(cmp)) return Qnil;
+
+	n = rb_cmpint(cmp, time1, time2);
+	if (n == 0) return INT2FIX(0);
+	if (n > 0) return INT2FIX(1);
+	return INT2FIX(-1);
+    }
 }
 
 /*