diff --git a/builds/win32/clean_all.bat b/builds/win32/clean_all.bat
index 14d82cb7a0..f177358a3c 100644
--- a/builds/win32/clean_all.bat
+++ b/builds/win32/clean_all.bat
@@ -2,6 +2,16 @@
 
 @call setenvvar.bat
 @if errorlevel 1 (goto :END)
+
+set FB_CLEAN_SHARED=
+
+:: Read the command line
+for %%v in ( %* )  do (
+( if /I "%%v"=="REALCLEAN" (set FB_CLEAN_SHARED=1) )
+)
+
+
+
 @echo Cleaning temporary directories...
 @rmdir /S /Q %FB_OUTPUT_DIR% 2>nul
 @rmdir /S /Q %FB_TEMP_DIR% 2>nul
@@ -12,13 +22,10 @@
 @echo Cleaning icu...
 @rmdir /S /Q %FB_ROOT_PATH%\extern\icu\%FB_TARGET_PLATFORM%\%FBBUILD_BUILDTYPE% 2>nul
 
-
-
 @echo Cleaning decNumber...
 @rmdir /S /Q %FB_ROOT_PATH%\extern\decNumber\lib\%FB_TARGET_PLATFORM% 2>nul
 @rmdir /S /Q %FB_ROOT_PATH%\extern\decNumber\temp\%FB_TARGET_PLATFORM% 2>nul
 
-
 @echo Cleaning libtomcrypt...
 @rmdir /S /Q %FB_ROOT_PATH%\extern\libtomcrypt\lib\%FB_TARGET_PLATFORM% 2>nul
 @rmdir /S /Q %FB_ROOT_PATH%\extern\libtomcrypt\temp\%FB_TARGET_PLATFORM% 2>nul
@@ -30,14 +37,6 @@
 @echo Cleaning re2...
 @rmdir /S /Q %FB_ROOT_PATH%\extern\re2\builds\%FB_TARGET_PLATFORM% 2>nul
 
-@echo Cleaning zlib...
-@rmdir /S /Q %FB_ROOT_PATH%\extern\zlib\%FB_TARGET_PLATFORM%
-::2>nul
-@rmdir /S %FB_ROOT_PATH%\extern\zlib\zconf.h
-::2>nul
-@rmdir /S /Q %FB_ROOT_PATH%\extern\zlib\zlib.h
-::2>nul
-
 @echo Cleaning examples
 @rmdir /S /Q %FB_ROOT_PATH%\examples\prebuilt\%FB_TARGET_PLATFORM% 2>nul
 
@@ -51,6 +50,17 @@ if defined FB_CLEAN_SHARED (
 @del %FB_ROOT_PATH%\extern\icu\source\extra\uconv\pkgdatain.txt 2>nul
 @del %FB_ROOT_PATH%\extern\icu\source\stubdata\stubdatabuilt.txt 2>nul
 @rmdir /S /Q %FB_ROOT_PATH%\extern\icu\source\test\testdata\out 2>nul
+
+@echo Cleaning zlib...
+@rmdir /S /Q %FB_ROOT_PATH%\extern\zlib\%FB_TARGET_PLATFORM% 2>nul
+@del %FB_ROOT_PATH%\extern\zlib\zconf.h 2>nul
+@del %FB_ROOT_PATH%\extern\zlib\zlib.h 2>nul
+
+@echo Cleaning shared gen and dsql files...
+@del %FB_ROOT_PATH%\src\include\gen\parse.h 2>nul
+@del %FB_ROOT_PATH%\src\dsql\dsql.tab.h 2>nul
+@del %FB_ROOT_PATH%\src\dsql\parse.cpp 2>nul
+
 )
 
 :: This really does clean the icu stuff - but is it too much? Cleaning less
@@ -68,13 +78,6 @@ set FB_INTLREALCLEAN=
 @del *.manifest 2>nul
 
 
-if defined FB_CLEAN_SHARED (
-@echo Cleaning shared gen and dsql files...
-@del %FB_ROOT_PATH%\src\include\gen\parse.h 2>nul
-@del %FB_ROOT_PATH%\src\dsql\dsql.tab.h 2>nul
-@del %FB_ROOT_PATH%\src\dsql\parse.cpp 2>nul
-)
-
 
 @rmdir /s /q %FB_ROOT_PATH%\builds\win32\install_image 2>nul