diff --git a/ChangeLog b/ChangeLog
index b161b7e3d25f06..26dfaf76b1df0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jan 27 21:41:47 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* win32/win32.c: get rid of STRNDUPA(). It's dangerous API.
+
 Thu Jan 27 21:31:57 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
 	* win32/win32.c (rb_w32_aspawn): get rid of too huge alloca().
diff --git a/win32/win32.c b/win32/win32.c
index 83b7f73a2fde3f..6366d921ed7453 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -966,9 +966,6 @@ join_argv(char *cmd, char *const *argv, BOOL escape)
 # define MAXPATHLEN 512
 #endif
 
-#define STRNDUPA(ptr, src, len) \
-    (((char *)memcpy(((ptr) = ALLOCA_N(char, (len) + 1)), (src), (len)))[len] = 0)
-
 #define STRNDUPV(ptr, v, src, len)					\
     (((char *)memcpy(((ptr) = ALLOCV((v), (len) + 1)), (src), (len)))[len] = 0)