diff --git a/.travis/appveyor-deploy.ps1 b/.travis/appveyor-deploy.ps1
index 5f3fa01a3..cc3dce4cc 100644
--- a/.travis/appveyor-deploy.ps1
+++ b/.travis/appveyor-deploy.ps1
@@ -1,6 +1,6 @@
 mv setup_win.bat internal\
 
-$filename = "qb64_" + (get-date -uformat "%Y-%m-%d-%H-%M-%S") + "_" + $Env:APPVEYOR_REPO_COMMIT.Substring(0,7) + "-" + $Env:APPVEYOR_REPO_BRANCH + "_win.7z"
+$filename = "qb64_" + (get-date -uformat "%Y-%m-%d-%H-%M-%S") + "_" + $Env:APPVEYOR_REPO_COMMIT.Substring(0,7) + "-" + $Env:APPVEYOR_REPO_BRANCH + "_win_" + $Env:PLATFORM + ".7z"
 cd ..
 qb64\internal\c\c_compiler\7z\7za.exe a '-xr@qb64\.travis\common-exclusion.list' '-xr@qb64\.travis\win-exclusion.list' $filename qb64
 
diff --git a/.travis/appveyor.bat b/.travis/appveyor.bat
index 3f4cc5c26..e5deef6fa 100644
--- a/.travis/appveyor.bat
+++ b/.travis/appveyor.bat
@@ -5,10 +5,11 @@ del /q /s internal\c\parts\*.o >nul 2>nul
 del /q /s internal\c\parts\*.a >nul 2>nul
 del /q /s internal\temp\*.* >nul 2>nul
 
-cd internal\c\c_compiler
-echo Extracting C++ compiler
-7z\7za.exe x -y c_compiler.7z >nul
-cd ..\..\..
+cd internal\c
+reg Query "HKLM\Hardware\Description\System\CentralProcessor\0" | find /i "x86" > NUL && set MINGW=mingw32 || set MINGW=mingw64
+echo Using %MINGW% as C++ Compiler
+ren %MINGW% c_compiler
+cd ../..
 
 echo Building library 'LibQB'
 cd internal\c\libqb\os\win
@@ -54,5 +55,6 @@ del /q /s internal\c\libqb\*.o >nul 2>nul
 del /q /s internal\c\libqb\*.a >nul 2>nul
 del /q /s internal\c\parts\*.o >nul 2>nul
 del /q /s internal\c\parts\*.a >nul 2>nul
+del /q /s internal\c\mingw*
 cd internal\source
 del /q /s debug_* recompile_*
diff --git a/appveyor.yml b/appveyor.yml
index 9a48a055a..de4c2c503 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,6 +4,9 @@ clone_depth: 1
 environment:
   sshkey:
     secure: BiD9D+ye4Q+R8yBsThsfG0K+SFL5gRx6gNfxxSTR8ge3lp98cwZ3y7T3bq7tmgE7
+platform:
+  - x86
+  - x64
 build_script:
 - cmd: .travis\appveyor.bat
 install:
@@ -11,4 +14,4 @@ install:
   - cmd: secure-file\tools\secure-file -decrypt .travis\qb64.org_rsa.enc -secret %sshkey% -out %userprofile%\.ssh\id_rsa
 deploy_script:
   - ps: .travis\appveyor-deploy.ps1
-test: off
\ No newline at end of file
+test: off