diff --git a/ChangeLog b/ChangeLog
index 96fde4af8d..e19a543bca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Apr 21 09:58:04 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* time.c (rb_strftime): check errno to detect strftime(3)'s error.
+	  this is workaround for recent version of MSVCRT.
+	  [ruby-dev:34456]
+
 Mon Apr 21 08:54:30 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* gc.c (ruby_xmalloc): use size_t for malloc argument instead of long.
diff --git a/time.c b/time.c
index 74c6684c7c..ba4c69ef0a 100644
--- a/time.c
+++ b/time.c
@@ -2003,8 +2003,9 @@ rb_strftime(char **buf, const char *format, struct tm *time)
     if (flen == 0) {
 	return 0;
     }
+    errno = 0;
     len = strftime(*buf, SMALLBUF, format, time);
-    if (len != 0 || **buf == '\0') return len;
+    if (len != 0 || (**buf == '\0' && errno != ERANGE)) return len;
     for (size=1024; ; size*=2) {
 	*buf = xmalloc(size);
 	(*buf)[0] = '\0';