diff --git a/ChangeLog b/ChangeLog
index 47a3227d9f..841b0bdb0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jul  3 22:48:45 2009  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (find_time_t): less number of guesses for hh:mm:60.
+
 Fri Jul  3 21:30:14 2009  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* complex.c (nucomp_equal_p): removed.
diff --git a/time.c b/time.c
index 39c5e54a10..6775e821f4 100644
--- a/time.c
+++ b/time.c
@@ -1862,10 +1862,12 @@ timegm_noleapsecond(struct tm *tm)
 
 #if 0
 #define DEBUG_FIND_TIME_NUMGUESS
-#define DEBUG_REPORT_GUESSRANGE fprintf(stderr, "find time guess range: %ld - %ld : %lu\n", guess_lo, guess_hi, (unsigned_time_t)(guess_hi-guess_lo))
+#define DEBUG_GUESSRANGE
 #endif
 
-#ifndef DEBUG_REPORT_GUESSRANGE
+#ifdef DEBUG_GUESSRANGE
+#define DEBUG_REPORT_GUESSRANGE fprintf(stderr, "find time guess range: %ld - %ld : %lu\n", guess_lo, guess_hi, (unsigned_time_t)(guess_hi-guess_lo))
+#else
 #define DEBUG_REPORT_GUESSRANGE
 #endif
 
@@ -1962,15 +1964,23 @@ find_time_t(struct tm *tptr, int utc_p, time_t *tp)
             if (status == 1) {
                 time_t guess0_hi = timegm_noleapsecond(&tm_hi);
                 guess = guess_hi - (guess0_hi - guess0);
+                if (guess == guess_hi) /* hh:mm:60 tends to cause this condition. */
+                    guess--;
                 status = 2;
             }
             else if (status == 2) {
                 time_t guess0_lo = timegm_noleapsecond(&tm_lo);
                 guess = guess_lo + (guess0 - guess0_lo);
+                if (guess == guess_lo)
+                    guess++;
                 status = 0;
             }
             if (guess <= guess_lo || guess_hi <= guess) {
                 /* Precious guess is invalid. try binary search. */
+#ifdef DEBUG_GUESSRANGE
+                if (guess <= guess_lo) fprintf(stderr, "too small guess: %ld <= %ld\n", guess, guess_lo);
+                if (guess_hi <= guess) fprintf(stderr, "too big guess: %ld <= %ld\n", guess_hi, guess);
+#endif
                 goto binsearch;
             }
         }