diff --git a/.appveyor-build.sh b/.appveyor-build.sh
new file mode 100644
index 000000000..709f8543f
--- /dev/null
+++ b/.appveyor-build.sh
@@ -0,0 +1,10 @@
+set -v
+
+export PATH=/mingw64/bin:/usr/local/bin:/usr/bin:/bin:/c/Windows/system32:/c/Windows:/c/Windows/System32/Wbem:/c/Windows/System32/WindowsPowerShell/v1.0:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl
+
+cd $1
+
+sh ./autogen.sh
+./configure --prefix=c:/projects/charybdis/build --enable-openssl=/mingw64
+make -j2
+make install
diff --git a/.appveyor.yml b/.appveyor.yml
index 94f7d3b48..dc69dddd3 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,22 +1,13 @@
 version: 3.6-dev_{build}
 clone_depth: 10
 install:
-  - c:\msys64\usr\bin\sh.exe -lc "pacman -Sy --noconfirm mingw-w64-x86_64-libwinpthread-git"
   - c:\msys64\usr\bin\sh.exe -lc "uname -a"
   - c:\msys64\usr\bin\sh.exe -lc "cat /proc/cpuinfo"
   - c:\msys64\usr\bin\sh.exe -lc "cat /proc/meminfo"
   - c:\msys64\usr\bin\sh.exe -lc "cygcheck -s -v > $APPVEYOR_BUILD_FOLDER/cygcheck.log 2>&1"
-  - c:\msys64\usr\bin\sh.exe -lc "echo $PATH"
-  - c:\msys64\usr\bin\sh.exe -lc "ldd /mingw64/lib/gcc/x86_64-w64-mingw32/5.3.0/cc1.exe"
-  - c:\msys64\usr\bin\sh.exe -lc "/mingw64/bin/x86_64-w64-mingw32-gcc.exe -v"
-  - c:\msys64\usr\bin\sh.exe -lc "echo 'int main(void) { return 0; }' > gcc-test.c && /mingw64/bin/../lib/gcc/x86_64-w64-mingw32/5.3.0/cc1.exe -v -D_REENTRANT gcc-test.c -dumpbase gcc-test.c -mtune=generic -march=x86-64 -auxbase gcc-test -version -o cc1-test.s"
-#  - c:\msys64\usr\bin\sh.exe -lc "./gcc-test"
   - ps: Push-AppveyorArtifact cygcheck.log
 build_script:
-  - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; ./autogen.sh < /dev/null"
-  - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; env CC=/mingw64/bin/x86_64-w64-mingw32-gcc.exe ./configure --prefix=c:/projects/charybdis/build --enable-openssl=/mingw64 < /dev/null"
-  - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; make -j2 < /dev/null"
-  - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; make install < /dev/null"
+  - c:\msys64\usr\bin\sh.exe -l ".appveyor-build.sh"
   - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER/build/bin; ./charybdis -version"
 on_failure:
   - ps: Push-AppveyorArtifact config.log