diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index e273260401..6594648561 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -90,7 +90,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 $(srcdir:/=\)\win32\rm.bat -r
+RMALL = $(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat -f -r
 MAKEDIRS = $(COMSPEC) /E:ON /C $(srcdir:/=\)\win32\makedirs.bat
 CP = copy > nul
 MV = move > nul
diff --git a/win32/rm.bat b/win32/rm.bat
index 949644111b..8dddf454d6 100755
--- a/win32/rm.bat
+++ b/win32/rm.bat
@@ -1,7 +1,7 @@
 @echo off
 :optloop
 if "%1" == "-f" shift
-if "%1" == "-r" (shift & set recursive=1 & goto :optloop)
+if "%1" == "-r" (shift & set "recursive=1" & goto :optloop)
 if "%recursive%" == "1" goto :recursive
 :begin
 if "%1" == "" goto :end