diff --git a/ChangeLog b/ChangeLog
index 571a8a8368..392c8bfaa8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep  7 22:05:28 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (insert): should use plain strdup() instead of
+	  ruby_strdup() at startup time, and plain free()ed in cmdglob().
+
 Mon Sep  7 16:50:07 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* vm_core.h (rb_vm_struct): define objspace always regardless
diff --git a/win32/win32.c b/win32/win32.c
index 2a58876c4d..42ff582fef 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -90,6 +90,7 @@ static char *w32_getenv(const char *name, UINT cp);
 #undef close
 #undef setsockopt
 #undef dup2
+#undef strdup
 
 #if RUBY_MSVCRT_VERSION >= 140
 # define _filbuf _fgetc_nolock