diff --git a/ChangeLog b/ChangeLog
index 783c5bdfc4..0666a3bb94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun  1 19:12:37 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_cmdvector): backslashes inside single-quotes
+	  no longer has special meanings.  fixed: [ruby-list:42311]
+
 Thu Jun  1 16:17:26 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (rb_w32_getcwd): runtime's getcwd() will not success
diff --git a/win32/win32.c b/win32/win32.c
index 62a65d2346..3c7ac46ce5 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -1179,7 +1179,7 @@ rb_w32_cmdvector(const char *cmd, char ***vec)
 
 	    switch (*ptr) {
 	      case '\\':
-		slashes++;
+		if (quote != '\'') slashes++;
 	        break;
 
 	      case ' ':
@@ -1261,7 +1261,7 @@ rb_w32_cmdvector(const char *cmd, char ***vec)
 		switch (c = *p) {
 		  case '\\':
 		    p++;
-		    slashes++;
+		    if (quote != '\'') slashes++;
 		    break;
 
 		  case '\'':