diff --git a/appveyor.yml b/appveyor.yml
index 0d96a20e..eb569306 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -17,9 +17,13 @@ environment:
   - MSYSTEM: MINGW32
 
 install:
+- c:\msys64\usr\bin\bash -lc "pacman --noconfirm -Rns gcc-fortan gcc"
 - c:\msys64\usr\bin\bash -lc "pacman --noconfirm -Syuu"
 - c:\msys64\usr\bin\bash -lc "pacman --noconfirm -Syuu"
-- c:\msys64\usr\bin\bash -lc "pacman -Rns gcc"
+- echo --- Print list of installed packages ---
+- c:\msys64\usr\bin\bash -lc "pacman -Q"
+- echo --- End of list ---
+
 - if "%MSYSTEM%" == "MINGW64" (
     c:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-x86_64-boost mingw-w64-x86_64-miniupnpc"
   ) else (
@@ -27,12 +31,17 @@ install:
   )
 
 build_script:
+- if "%MSYSTEM%" == "MINGW64" (
+    cc=/mingw64/bin/g++
+  ) else (
+    cc=/mingw32/bin/g++
+  )
 - cmd: >-
     cd \projects\i2pd
 
     echo MSYSTEM=%MSYSTEM%
 
-    c:\msys64\usr\bin\bash -lc "make USE_UPNP=YES"
+    c:\msys64\usr\bin\bash -lc "cc=%cc% make USE_UPNP=YES"
 
     7z a -tzip -mx9 -mmt i2pd-mingw-win%bitness%.zip i2pd.exe