diff --git a/.appveyor.yml b/.appveyor.yml
index 3ed0869e..64822f6b 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,54 +1,37 @@
-#
-# Appveyor configuration file for CI build of Unicorn on Windows (under Cygwin)
-#
-# For further details see http://www.appveyor.com
-#
-
-#
-# Custom environment variables
-#
+# Appveyor configuration file for CI build of Unicorn Engine on Windows (under Cygwin)
 environment:
-    global:
-        CYG_ROOT: C:\cygwin
-        CYG_MIRROR: http://cygwin.mirror.constant.com
-        CYG_CACHE: C:\cygwin\var\cache\setup
-        CYG_BASH: C:\cygwin\bin\bash
+    matrix:
+        - CYG_ROOT: C:\cygwin64
+          CYG_SETUP: setup-x86_64.exe
+          CYG_MIRROR: http://cygwin.mirror.constant.com
+          CYG_CACHE: C:\cygwin64\var\cache\setup
+          CYG_BASH: C:\cygwin64\bin\bash
+          CC: gcc
+        - CYG_ROOT: C:\cygwin
+          CYG_SETUP: setup-x86.exe
+          CYG_MIRROR: http://cygwin.mirror.constant.com
+          CYG_CACHE: C:\cygwin\var\cache\setup
+          CYG_BASH: C:\cygwin\bin\bash
+          CC: gcc
 
-#
 # Cache Cygwin files to speed up build
-#
 cache:
     - '%CYG_CACHE%'
+clone_depth: 1
 
-#
-# Initialisation prior to pulling Unicorn repository
 # Attempt to ensure we don't try to convert line endings to Win32 CRLF as this will cause build to fail
-#
 init:
     - git config --global core.autocrlf input
 
-#
 # Install needed build dependencies
-#
 install:
-    - cd %CYG_CACHE%
-    - ps: 'Start-FileDownload "http://cygwin.com/setup-x86.exe" -FileName "setup-x86.exe"'
-    - 'echo Installing Cygwin packages ...'
-    - 'setup-x86.exe -q --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages make,gcc-core,pkg-config,libpcre-devel,libglib2.0-devel > NUL 2>&1'
+    - ps: 'Start-FileDownload "http://cygwin.com/$env:CYG_SETUP" -FileName "$env:CYG_SETUP"'
+    - '%CYG_SETUP% --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages make,gcc-core,pkg-config,libpcre-devel,libglib2.0-devel > NUL 2>&1'
     - '%CYG_BASH% -lc "cygcheck -dc cygwin"'
 
-# Cygwin build script
-#
-# NOTES:
-#
-# The stdin/stdout file descriptor appears not to be valid for the Appveyor
-# build which causes failures as certain functions attempt to redirect 
-# default file handles. Ensure a dummy file descriptor is opened with 'exec'.
-#
 build_script:
-    - 'echo Building ...'
-    - pwd
-    - '%CYG_BASH% -lc "export CYGWIN=winsymlinks:native; cd /cygdrive/c/projects/unicorn; ./make.sh"'
+    - 'echo building...'
+    - '%CYG_BASH% -lc "export CYGWIN=winsymlinks:native; cd $APPVEYOR_BUILD_FOLDER; ./make.sh"'
 
 #
 # Disable tests for now