diff --git a/Makefile.win b/Makefile.win
index 28635b5afcb..528551bd515 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -17,6 +17,10 @@ kill:
 # allow Ocaml/Mingw as well
 NATIVE_LIBS += -I "c:/program files/mingw/lib/"
 
+ifdef WODI
+NATIVE_LIBS += -I "/opt/${WODI}/lib"
+endif
+
 # use make MSVC=1 -f Makefile.win to build for OCaml/MSVC
 
 ifeq (${MSVC}, 1)
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 00000000000..3009fd03c22
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,60 @@
+version: "{build}"
+
+platform:
+    - Win32
+
+clone_folder: C:/projects/haxe
+
+environment:
+    global:
+        CYG_MIRROR: http://cygwin.uib.no
+        CYG_CACHE: C:/cygwin/var/cache/setup
+        NEKO_ROOT: C:/projects/neko
+    matrix:
+        -   CYG_ARCH: x86
+            CYG_ROOT: C:/cygwin
+            WODI_ARCH: 32
+            MINGW_ARCH: i686
+        # -   CYG_ARCH: x86_64
+        #     CYG_ROOT: C:/cygwin64
+        #     WODI_ARCH: 64
+        #     MINGW_ARCH: x86_64
+
+init:
+    - 'echo System architecture: %PLATFORM%'
+
+install:
+    - 'git submodule update --init --recursive'
+    # Install ocaml using wodi
+    - 'appveyor DownloadFile http://cygwin.com/setup-%CYG_ARCH%.exe -FileName cygwin-setup.exe'
+    - 'cygwin-setup.exe -qnNdO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_CACHE%" -P wget -P dos2unix -P diffutils -P cpio -P make -P patch -P mingw64-%MINGW_ARCH%-gcc-core -P mingw64-%MINGW_ARCH%-gcc-g++ >NUL'
+    - '%CYG_ROOT%/bin/bash -lc "cygcheck -dc cygwin"'
+    - '%CYG_ROOT%/bin/bash -lc "wget -q http://ml.ignorelist.com/wodi/8/wodi%WODI_ARCH%.tar.xz -O /tmp/wodi%WODI_ARCH%.tar.xz"'
+    - '%CYG_ROOT%/bin/bash -lc "cd /tmp && rm -rf wodi%WODI_ARCH% && tar -xf wodi%WODI_ARCH%.tar.xz && bash wodi%WODI_ARCH%/install.sh"'
+    - '%CYG_ROOT%/bin/bash -lc "godi_add godi-zip"'
+    - 'set PATH=%PATH%;%CYG_ROOT%/opt/wodi%WODI_ARCH%/bin'
+    # Install neko
+    - cinst make
+    - cinst SQLite -version 3.8.5
+    - 'git clone --recursive https://github.com/HaxeFoundation/neko.git %NEKO_ROOT%'
+    - 'cd %NEKO_ROOT%'
+    - set PATH=%PATH%;%NEKO_ROOT%/bin
+    - msbuild neko_vc10.sln /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+    - msbuild libs/libs_vc10.sln /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+    - copy /y libs\include\gc\gc.dll bin
+    - cd %NEKO_ROOT%/src
+    - neko ../boot/nekoc tools/install.neko
+    - neko tools/install -nolibs
+    - neko -version
+
+build_script:
+    - 'cd %APPVEYOR_BUILD_FOLDER%'
+    - '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\" && make -f Makefile.win WODI=wodi%WODI_ARCH%"'
+    - 'set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%'
+
+test_script:
+    - haxe -version
+    - cd tests/unit
+    - haxe compile-macro.hxml
+    - haxe compile-neko.hxml
+    - neko bin/unit.n