diff --git a/ChangeLog b/ChangeLog
index 4ab119dd60..27982040ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Mar  1 15:40:05 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/makedirs.bat: new command to make intermediate
+	  directories, and not to report any errors if the directory
+	  already exists.
+
+	* win32/Makefile.sub (MAKEDIRS): enable command extensions.
+
 Thu Mar  1 01:25:43 2012  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* regparse.c (is_onechar_cclass): optimize character class
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 87a4206da5..df3ae39398 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -74,6 +74,7 @@ RM = $(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat
 RMDIR = $(COMSPEC) /C $(srcdir:/=\)\win32\rmdirs.bat
 RMDIRS = $(COMSPEC) /C $(srcdir:/=\)\win32\rmdirs.bat
 RMALL = $(COMSPEC) /C $(srcdir:/=\)\win32\rmall.bat
+MAKEDIRS = $(COMSPEC) /E:ON /C $(srcdir:/=\)\win32\makedirs.bat
 CP = copy > nul
 MV = move > nul
 !if !defined(BASERUBY)
@@ -289,8 +290,6 @@ DEFAULT_PRELUDES = $(NO_GEM_PRELUDE)
 DEFAULT_PRELUDES = $(YES_GEM_PRELUDE)
 !endif
 
-MAKEDIRS = mkdir
-
 !if !defined(STACK)
 !if "$(ARCH)" == "x64" || "$(ARCH)" == "ia64"
 STACK = 0x400000
diff --git a/win32/makedirs.bat b/win32/makedirs.bat
new file mode 100755
index 0000000000..13740d8778
--- /dev/null
+++ b/win32/makedirs.bat
@@ -0,0 +1,3 @@
+@echo off
+setlocal EnableExtensions
+for %%I in (%*) do if not exist "%%~I/." mkdir "%%~I"
diff --git a/win32/rmall.bat b/win32/rmall.bat
old mode 100644
new mode 100755