diff --git a/ChangeLog b/ChangeLog
index e8470ec837..ef6e9f15d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Thu Mar  5 13:21:43 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Mar  5 14:52:46 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_sysinit): initializes version info first.
 
 	* win32/win32.c (rb_w32_osid): always define for binary compatibility.
 
diff --git a/win32/win32.c b/win32/win32.c
index 97353b896b..9bac0b5cae 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -196,10 +196,6 @@ rb_w32_map_errno(DWORD winerr)
 static const char *NTLoginName;
 
 static OSVERSIONINFO osver;
-#ifdef _M_IX86
-static DWORD Win32System = (DWORD)-1;
-#endif
-static DWORD Win32Version = (DWORD)-1;
 
 static void
 get_version(void)
@@ -207,28 +203,20 @@ get_version(void)
     memset(&osver, 0, sizeof(OSVERSIONINFO));
     osver.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
     GetVersionEx(&osver);
-    Win32System = osver.dwPlatformId;
-    Win32Version = osver.dwMajorVersion;
 }
 
 #ifdef _M_IX86
 DWORD
 rb_w32_osid(void)
 {
-    if (osver.dwPlatformId != Win32System) {
-	get_version();
-    }
-    return (Win32System);
+    return osver.dwPlatformId;
 }
 #endif
 
 static DWORD
 rb_w32_osver(void)
 {
-    if (osver.dwMajorVersion != Win32Version) {
-	get_version();
-    }
-    return (Win32Version);
+    return osver.dwMajorVersion;
 }
 
 #define IsWinNT() rb_w32_iswinnt()
@@ -552,6 +540,8 @@ rb_w32_sysinit(int *argc, char ***argv)
     set_pioinfo_extra();
 #endif
 
+    get_version();
+
     //
     // subvert cmd.exe's feeble attempt at command line parsing
     //