diff --git a/build/build_mingw.cmd b/build/build_mingw.cmd
index e8f1378b..a4e6d8de 100644
--- a/build/build_mingw.cmd
+++ b/build/build_mingw.cmd
@@ -34,13 +34,19 @@ del /S build_*.log >> nul 2>&1
 
 echo Receiving latest commit and cleaning up...
 %xSH% "git checkout contrib/* && git pull && make clean" > build\build.log 2>&1
-echo.
 
 REM set to variable current commit hash
-FOR /F "usebackq" %%a IN (`%xSH% 'git describe --tags'`) DO (
+FOR /F "usebackq" %%a IN (`%xSH% "git describe --tags"`) DO (
  set tag=%%a
 )
 
+REM set to variable latest released tag
+FOR /F "usebackq" %%b IN (`%xSH% "git describe --abbrev=0"`) DO (
+ set reltag=%%b
+)
+
+echo Preparing configuration files and README for packaging...
+
 %xSH% "echo To use configs and certificates, move all files and certificates folder from contrib directory here. > README.txt" >> nul
 
 REM converting configuration files to DOS format (usable in default notepad)
@@ -64,8 +70,9 @@ call :BUILDING_XP
 echo.
 
 REM compile installer
-C:\PROGRA~2\INNOSE~1\ISCC.exe /dI2Pd_TextVer="%tag%" /dI2Pd_Ver="%tag%.0" build\win_installer.iss >> build\build.log 2>&1
+C:\PROGRA~2\INNOSE~1\ISCC.exe /dI2Pd_TextVer="%tag%" /dI2Pd_Ver="%reltag%.0" build\win_installer.iss >> build\build.log 2>&1
 
+%xSH% "git checkout contrib/*" >> build\build.log 2>&1
 del README.txt i2pd_x32.exe i2pd_x64.exe i2pd_xp.exe >> nul
 
 echo Build complete...
@@ -74,13 +81,13 @@ exit /b 0
 
 :BUILDING
 %xSH% "make clean" >> nul
-echo Building i2pd %tag% for win%bitness%
+echo Building i2pd %tag% for win%bitness%...
 %xSH% "make DEBUG=no USE_UPNP=yes -j%threads% && cp i2pd.exe i2pd_x%bitness%.exe && zip -r9 build/i2pd_%tag%_win%bitness%_mingw.zip %FILELIST% && make clean" > build\build_win%bitness%_%tag%.log 2>&1
 goto EOF
 
 :BUILDING_XP
 %xSH% "make clean" >> nul
-echo Building i2pd %tag% for winxp
+echo Building i2pd %tag% for winxp...
 %xSH% "make DEBUG=no USE_UPNP=yes USE_WINXP_FLAGS=yes -j%threads% && cp i2pd.exe i2pd_xp.exe && zip -r9 build/i2pd_%tag%_winxp_mingw.zip %FILELIST% && make clean" > build\build_winxp_%tag%.log 2>&1
 
 :EOF
\ No newline at end of file