diff --git a/ChangeLog b/ChangeLog
index 0e87710859..096755b016 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
+Wed Jun 29 23:17:57 2011  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/openssl/ossl.h (OPENSSL_SYS_WIN32): support for mingw(msys).
+
 Wed Jun 29 23:09:14 2011  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ex/tk/extconf.rb: support for the latest ActiveTcl with mingw.
+	* ext/tk/extconf.rb (intptr_t, uintptr_t): support for the latest ActiveTcl with mingw.
 
 Wed Jun 29 22:49:10 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
 
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
index f31179110f..cf393d4a67 100644
--- a/ext/openssl/ossl.h
+++ b/ext/openssl/ossl.h
@@ -46,6 +46,7 @@ extern "C" {
 
 #if defined(_WIN32)
 #  define OSSL_NO_CONF_API 1
+#  define OPENSSL_SYS_WIN32 1
 #  include <winsock2.h>
 #endif
 #include <errno.h>