diff --git a/win32/rm.bat b/win32/rm.bat
index 7f0336c202..fefc030545 100755
--- a/win32/rm.bat
+++ b/win32/rm.bat
@@ -4,12 +4,15 @@ set recursive=
 :optloop
 if "%1" == "-f" shift
 if "%1" == "-r" (shift & set "recursive=1" & goto :optloop)
+if "%1" == "--debug" (shift & set PROMPT=$E[34m+$E[m$S & echo on & goto :optloop)
 :begin
 if "%1" == "" goto :end
 set p=%1
-if exist "%p:/=\%" for %%I in ("%p:/=\%") do (
-    del /q "%%I" || if "%recursive%" == "1" rd /s /q "%%I"
-) 2> nul
+set p=%p:/=\%
+if exist "%p%" del /q "%p%" > nul
+if "%recursive%" == "1" for /D %%I in (%p%) do (
+    rd /s /q %%I
+)
 shift
 goto :begin
 :end