diff --git a/ChangeLog b/ChangeLog
index 014526fb9f..5e51df585c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 27 09:02:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_to_s): generate RFC822 style date string.
+	  [ruby-dev:29143]
+
 Wed Jul 26 22:20:59 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* configure.in: add support for as and ASFLAGS.  [ruby-dev:29138]
diff --git a/time.c b/time.c
index 62be1f521c..d68c1dfee3 100644
--- a/time.c
+++ b/time.c
@@ -1203,10 +1203,25 @@ time_to_s(VALUE time)
 	time_get_tm(time, tobj->gmt);
     }
     if (tobj->gmt == 1) {
-	len = strftime(buf, 128, "%a %b %d %H:%M:%S UTC %Y", &tobj->tm);
+	len = strftime(buf, 128, "%a %b %d %Y %H:%M:%S UTC", &tobj->tm);
     }
     else {
-	len = strftime(buf, 128, "%a %b %d %H:%M:%S %Z %Y", &tobj->tm);
+	time_t off;
+	char buf2[32];
+	char sign = '+';
+#if defined(HAVE_STRUCT_TM_TM_GMTOFF)
+	off = tobj->tm.tm_gmtoff;
+#else
+	VALUE tmp = time_utc_offset(time);
+	off = NUM2INT(tmp);
+#endif
+	if (off < 0) {
+	    sign = '-';
+	    off = -off;
+	}
+	sprintf(buf2, "%%a %%b %%d %%Y %%H:%%M:%%S %c%02d%02d",
+		sign, off/3600, off%3600/60);
+	len = strftime(buf, 128, buf2, &tobj->tm);
     }
     return rb_str_new(buf, len);
 }