diff --git a/.travis.yml b/.travis.yml
index e861e6cd5..eccf39e5b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,13 @@
 env:
   matrix:
     - export NODE_VERSION="0.10"
+    - export NODE_VERSION="0.12"
+    - export NODE_VERSION="iojs"
+matrix:
+  fast_finish: true
+  allow_failures:
+    - env: NODE_VERSION="0.10"
+    - env: NODE_VERSION="iojs"
 before_install:
   - git clone https://github.com/creationix/nvm.git ./.nvm
   - source ./.nvm/nvm.sh
diff --git a/README.md b/README.md
index 75b27b0ef..3e2519c6d 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,8 @@ NodeGit
   </tbody>
 </table>
 
+***NOTE: NodeGit currently does not work with [iojs on windows](https://github.com/rvagg/pangyp/issues/4)***
+
 **Stable: 0.2.7**
 
 ## Have a problem? Come chat with us! ##
diff --git a/appveyor.yml b/appveyor.yml
index 3631bea15..43d9c7e82 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -19,11 +19,21 @@ init:
 # what combinations to test
 environment:
   matrix:
-    - nodejs_version: 0.10
+    # Node.js
+    - nodejs_version: "0.10"
+    - nodejs_version: "0.12"
+    # io.js
+    - nodejs_version: "1"
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - nodejs_version: "0.10"
+    - nodejs_version: "1"
 
 # Get the latest stable version of Node 0.STABLE.latest
 install:
-  - ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version)
+  - ps: Install-Product node $env:nodejs_version
   - cmd: SET PATH=C:\Program Files (x86)\MSBuild\12.0\bin\;%PATH%
   - cmd: SET PATH=c:\python27;%PATH%
   - cmd: SET JOBS=4
diff --git a/generate/templates/templates/binding.gyp b/generate/templates/templates/binding.gyp
index 845c39a8d..06adb5307 100644
--- a/generate/templates/templates/binding.gyp
+++ b/generate/templates/templates/binding.gyp
@@ -52,6 +52,15 @@
               ]
             }
           }
+        ], [
+          "OS=='win'", {
+            "cflags": [
+              "/EHsc"
+            ],
+            "defines": [
+            "_HAS_EXCEPTIONS=1"
+            ]
+          }
         ]
       ]
     }
diff --git a/lifecycleScripts/install.js b/lifecycleScripts/install.js
index 042d8b520..c208f298b 100644
--- a/lifecycleScripts/install.js
+++ b/lifecycleScripts/install.js
@@ -90,7 +90,7 @@ function build() {
   var prefix = "";
   var target = "";
   var debug = (process.env.BUILD_DEBUG ? " --debug" : "");
-  var builder = "node-gyp";
+  var builder = "pangyp";
   var distUrl = "";
 
   if (asVersion) {
diff --git a/package.json b/package.json
index 2af20f46c..ea31ded5d 100644
--- a/package.json
+++ b/package.json
@@ -69,8 +69,8 @@
     "lodash": "^3.1.0",
     "mocha": "~2.1.0",
     "nan": "^1.7.0",
-    "node-gyp": "~1.0.2",
     "nw-gyp": "^0.12.4",
+    "pangyp": "^2.1.0",
     "request": "^2.53.0",
     "tar": "^1.0.3"
   },
diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp
index a9a73fa40..0af36d465 100644
--- a/vendor/libgit2.gyp
+++ b/vendor/libgit2.gyp
@@ -106,7 +106,7 @@
         "libgit2/src/hash.c",
         "libgit2/src/hash.h",
         "libgit2/src/hashsig.c",
-        "libgit2/src/hashsig.h",
+        "libgit2/include/git2/sys/hashsig.h",
         "libgit2/src/ident.c",
         "libgit2/src/ignore.c",
         "libgit2/src/ignore.h",