diff --git a/tools/gyp/.github/workflows/nodejs-windows.yml b/tools/gyp/.github/workflows/nodejs-windows.yml
new file mode 100644
index 00000000000000..48a42372c2f0b0
--- /dev/null
+++ b/tools/gyp/.github/workflows/nodejs-windows.yml
@@ -0,0 +1,27 @@
+name: Node.js Windows integration
+
+on: [push, pull_request]
+
+jobs:
+  build-windows:
+    runs-on: windows-latest
+    steps:
+      - name: Clone node-gyp
+        uses: actions/checkout@v2
+        with:
+          path: gyp-next
+      - name: Clone nodejs/node
+        uses: actions/checkout@v2
+        with:
+          repository: nodejs/node
+          path: node
+      - name: Install deps
+        run: choco install nasm
+      - name: Replace gyp in Node.js
+        run: |
+          rm -Recurse node/tools/gyp
+          cp -Recurse gyp-next node/tools/gyp
+      - name: Build Node.js
+        run: |
+          cd node
+          ./vcbuild.bat
diff --git a/tools/gyp/LICENSE b/tools/gyp/LICENSE
index 372b8a9bc0d670..c6944c5e4ed488 100644
--- a/tools/gyp/LICENSE
+++ b/tools/gyp/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2019 Ujjwal Sharma. All rights reserved.
+Copyright (c) 2020 Node.js contributors. All rights reserved.
 Copyright (c) 2009 Google Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tools/gyp/pylib/gyp/common.py b/tools/gyp/pylib/gyp/common.py
index 3f2329bda4a96b..bfe546f8675291 100644
--- a/tools/gyp/pylib/gyp/common.py
+++ b/tools/gyp/pylib/gyp/common.py
@@ -364,7 +364,7 @@ def __init__(self):
                 dir=base_temp_dir,
             )
             try:
-                self.tmp_file = os.fdopen(tmp_fd, "w")
+                self.tmp_file = os.fdopen(tmp_fd, "wb")
             except Exception:
                 # Don't leave turds behind.
                 os.unlink(self.tmp_path)
diff --git a/tools/gyp/setup.py b/tools/gyp/setup.py
index bf2f03f7f9c030..0781c591847ffb 100755
--- a/tools/gyp/setup.py
+++ b/tools/gyp/setup.py
@@ -15,7 +15,7 @@
 
 setup(
     name="gyp-next",
-    version="0.2.0",
+    version="0.2.1",
     description="A fork of the GYP build system for use in the Node.js projects",
     long_description=long_description,
     long_description_content_type="text/markdown",