diff --git a/ChangeLog b/ChangeLog
index 466cb0398d..c46e3dba1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Sep  4 21:14:20 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (time_strftime): include nul character.  fixed: [ruby-dev:29422]
+
 Mon Sep  4 16:39:11 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/cgi.rb (CGI::out): specify -x option for nkf.
diff --git a/time.c b/time.c
index 0f178a78eb..3a18bd425d 100644
--- a/time.c
+++ b/time.c
@@ -1886,7 +1886,7 @@ time_strftime(VALUE time, VALUE format)
 	while (p < pe) {
 	    len = rb_strftime(&buf, p, &tobj->tm);
 	    rb_str_cat(str, buf, len);
-	    p += strlen(p) + 1;
+	    p += strlen(p);
 	    if (buf != buffer) {
 		free(buf);
 		buf = buffer;