diff --git a/ChangeLog b/ChangeLog
index 9bb2c4795a..cebbac2627 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Feb 24 11:17:45 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (NtInitialize): need to set a handler for VC++8.
+
 Thu Feb 23 22:39:59 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* bcc32/Makefile.sub: use borlndmm.dll if possible. bcc32's RTL internal
diff --git a/win32/win32.c b/win32/win32.c
index 973a795c46..3494461f32 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -410,6 +410,13 @@ init_env(void)
 
 static void init_stdhandle(void);
 
+#if _MSC_VER >= 1400
+static void invalid_parameter(const wchar_t *expr, const wchar_t *func, const wchar_t *file, unsigned int line, uintptr_t dummy)
+{
+    // nothing to do
+}
+#endif
+
 //
 // Initialization stuff
 //
@@ -420,6 +427,10 @@ NtInitialize(int *argc, char ***argv)
     WORD version;
     int ret;
 
+#if _MSC_VER >= 1400
+    _set_invalid_parameter_handler(invalid_parameter);
+#endif
+
     //
     // subvert cmd.exe's feeble attempt at command line parsing
     //