diff --git a/ChangeLog b/ChangeLog
index 5e51df585c..1530646d06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
-Thu Jul 27 09:02:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Jul 27 16:41:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* time.c (time_to_s): generate RFC822 style date string.
+	* ext/openssl/ossl.h: move <ruby.h> inclusion point to shut up
+	  Solaris compiler.  [ruby-core:08114]
+
+	* time.c (time_to_s): use +0900 style timezone string for local time.
 	  [ruby-dev:29143]
 
 Wed Jul 26 22:20:59 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
index 5ab93bf39e..0366901a35 100644
--- a/ext/openssl/ossl.h
+++ b/ext/openssl/ossl.h
@@ -17,6 +17,15 @@
 extern "C" {
 #endif
 
+/*
+* OpenSSL has defined RFILE and Ruby has defined RFILE - so undef it!
+*/
+#if defined(RFILE) /*&& !defined(OSSL_DEBUG)*/
+#  undef RFILE
+#endif
+#include <ruby.h>
+#include <rubyio.h>
+
 /*
  * Check the OpenSSL version
  * The only supported are:
@@ -60,15 +69,6 @@ extern "C" {
 #  undef OpenFile
 #endif
 
-/*
- * OpenSSL has defined RFILE and Ruby has defined RFILE - so undef it!
- */
-#if defined(RFILE) /*&& !defined(OSSL_DEBUG)*/
-#  undef RFILE
-#endif
-#include <ruby.h>
-#include <rubyio.h>
-
 /*
  * Common Module
  */
diff --git a/time.c b/time.c
index d68c1dfee3..e8c6924384 100644
--- a/time.c
+++ b/time.c
@@ -1219,7 +1219,7 @@ time_to_s(VALUE time)
 	    sign = '-';
 	    off = -off;
 	}
-	sprintf(buf2, "%%a %%b %%d %%Y %%H:%%M:%%S %c%02d%02d",
+	sprintf(buf2, "%%a %%b %%d %%H:%%M:%%S %c%02d%02d %%Y",
 		sign, off/3600, off%3600/60);
 	len = strftime(buf, 128, buf2, &tobj->tm);
     }