diff --git a/ChangeLog b/ChangeLog
index f4fa82e575..5946038a59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Dec 26 23:49:47 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* win32/Makefile.sub: suppress a strange error message when RMALL
+	  found no such file.
+	* win32/rmall.bat: new.
+
 Sun Dec 26 21:23:23 2010    <kosaki.motohiro@gmail.com>
 
 	* win32/Makefile.sub: fix 'nmake clean-enc' breakage since r28322.
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 67ebf9afc7..4e2a0697e4 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -72,7 +72,7 @@ IFCHANGE = $(COMSPEC) /C $(srcdir:/=\)\win32\ifchange.bat
 RM = $(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat
 RMDIR = $(COMSPEC) /C $(srcdir:/=\)\win32\rmdirs.bat
 RMDIRS = $(COMSPEC) /C $(srcdir:/=\)\win32\rmdirs.bat
-RMALL = $(COMSPEC) /C rmdir /s /q
+RMALL = $(COMSPEC) /C $(srcdir:/=\)\win32\rmall.bat
 CP = copy > nul
 MV = move > nul
 !if !defined(BASERUBY)
diff --git a/win32/rmall.bat b/win32/rmall.bat
new file mode 100644
index 0000000000..6c428b76fa
--- /dev/null
+++ b/win32/rmall.bat
@@ -0,0 +1,6 @@
+@echo off
+
+if "%1" == "" goto :end
+if exist "%1" rmdir /s /q "%1"
+
+:end