diff --git a/ChangeLog b/ChangeLog
index 33ee7921fe..bf085bb0c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec 27 20:26:59 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_argv_size): if an argument is empty, it's size
+	  is 2, not 0, because it will be converted to "".
+
 Sat Dec 27 19:40:56 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* process.c (after_exec): needs to reset before restart timer
diff --git a/win32/win32.c b/win32/win32.c
index d346a925d6..316b69b873 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -715,7 +715,7 @@ rb_w32_argv_size(char *const *argv)
 	    }
 	}
 	len += p - *t + n + 1;
-	if (quote) len += 2;
+	if (p - *t == 0 || quote) len += 2;
     }
     return len;
 }