diff --git a/ChangeLog b/ChangeLog
index c93345a46f..78d0b4a842 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Sep 19 17:46:46 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (ENABLE_VM_OBJSPACE): socklist needs st_table in
+	  rb_w32_sysinit(), before object space initialization.
+
 Sat Sep 19 17:32:59 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* dir.c (GlobPathValue), file.c (rb_get_path_check): path names
diff --git a/vm_core.h b/vm_core.h
index 6a5c31c922..9392ab5a1e 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -32,8 +32,19 @@
 #endif
 
 #ifndef ENABLE_VM_OBJSPACE
+#ifdef _WIN32
+/*
+ * TODO: object space indenpendent st_table.
+ * socklist needs st_table in rb_w32_sysinit(), before object space
+ * initialization.
+ * It is too early now to change st_hash_type, since it breaks binary
+ * compatibility.
+ */
+#define ENABLE_VM_OBJSPACE 0
+#else
 #define ENABLE_VM_OBJSPACE 1
 #endif
+#endif
 
 #include <setjmp.h>
 #include <signal.h>