diff --git a/.travis.yml b/.travis.yml
index 05d90fbc..ff1dbf34 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,7 @@ jobs:
         - PATH=/c/Python39:/c/Python39/Scripts:$PATH
         
       before_install:
-        - choco install python --version 3.9.1
+        - if [ ! -f /C/Qt/5.14.2/msvc2017/bin/qmake ]; then choco install python --version 3.9.1; fi
         
       script:
         - dir "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build"
diff --git a/deploy/build_windows.bat b/deploy/build_windows.bat
new file mode 100644
index 00000000..12ba6835
--- /dev/null
+++ b/deploy/build_windows.bat
@@ -0,0 +1,74 @@
+ @ECHO OFF
+
+CHCP 1252
+
+REM set QT_BIN_DIR="c:\Qt\5.14.1\msvc2017\bin"
+set QT_BIN_DIR="C:\terminal\3rd\release\Qt5\bin"
+set QIF_BIN_DIR="c:\Qt\Tools\QtInstallerFramework\4.0\bin"
+
+# Hold on to current directory
+set PROJECT_DIR=%cd%
+set SCRIPT_DIR=%PROJECT_DIR:"=%\deploy
+
+mkdir %SCRIPT_DIR:"=%\build
+set WORK_DIR=%SCRIPT_DIR:"=%\build
+
+
+set APP_NAME=AmneziaVPN
+set APP_FILENAME=%APP_NAME:"=%.exe
+set APP_DOMAIN=org.amneziavpn.package
+set RELEASE_DIR=%WORK_DIR:"=%
+set OUT_APP_DIR=%RELEASE_DIR:"=%\client\release
+set DEPLOY_DATA_DIR=%LAUNCH_DIR:"=%\data\windows
+set INSTALLER_DATA_DIR=%RELEASE_DIR:"=%\installer\packages\%APP_DOMAIN:"=%\data
+set PRO_FILE_PATH=%PROJECT_DIR:"=%\%APP_NAME:"=%.pro
+set QMAKE_STASH_FILE=%PROJECT_DIR:"=%\.qmake_stash
+set TARGET_FILENAME=%PROJECT_DIR:"=%\%APP_NAME:"=%.exe
+
+echo "Environment:"
+echo "APP_FILENAME:			%APP_FILENAME%"
+echo "PROJECT_DIR:			%PROJECT_DIR%"
+echo "SCRIPT_DIR:			%SCRIPT_DIR%"
+echo "RELEASE_DIR:			%RELEASE_DIR%"
+echo "OUT_APP_DIR:			%OUT_APP_DIR%"
+echo "DEPLOY_DATA_DIR: 		%DEPLOY_DATA_DIR%"
+echo "INSTALLER_DATA_DIR: 		%INSTALLER_DATA_DIR%"
+echo "PRO_FILE_PATH: 		%PRO_FILE_PATH%"
+echo "QMAKE_STASH_FILE: 		%QMAKE_STASH_FILE%"
+echo "TARGET_FILENAME: 		%TARGET_FILENAME%"
+
+echo "Cleanup..."
+Rmdir /Q /S %RELEASE_DIR%
+Del %QMAKE_STASH_FILE%
+Del %TARGET_FILENAME%
+
+cd %PROJECT_DIR%
+"%QT_BIN_DIR:"=%\qmake" -spec win32-msvc  -o deploy\build\Makefile
+
+cd %WORK_DIR%
+set CL=/MP
+nmake /A /NOLOGO
+nmake clean
+ 
+echo "Deploying..."
+"%QT_BIN_DIR:"=%\windeployqt" --release --force --no-translations "%OUT_APP_DIR:"=%\%APP_FILENAME:"=%"
+echo "Copying deploy data..."
+xcopy %DEPLOY_DATA_DIR% 											%OUT_APP_DIR%  /s /e /y /i /f
+copy "%WORK_DIR:"=%\service\server\release\%APP_NAME:"=%-service.exe"	%OUT_APP_DIR%
+copy "%WORK_DIR:"=%\platform\post-uninstall\release\post-uninstall.exe"	%OUT_APP_DIR%
+
+cd %SCRIPT_DIR%
+xcopy %SCRIPT_DIR:"=%\installer 									%RELEASE_DIR:"=%\installer /s /e /y /i /f
+mkdir %INSTALLER_DATA_DIR%
+
+cd %OUT_APP_DIR%
+echo "Compressing data..."
+"%QIF_BIN_DIR:"=%\archivegen" -c 9 %INSTALLER_DATA_DIR:"=%\%APP_NAME:"=%.7z ./
+
+cd "%RELEASE_DIR:"=%\installer"
+echo "Creating installer..."
+"%QIF_BIN_DIR:"=%\binarycreator" --offline-only -v -c config\windows.xml -p packages -f %TARGET_FILENAME%
+
+
+cd %PROJECT_DIR%
+echo "Finished, see %TARGET_FILENAME%"