diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35d8d9e71..a4bce90bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## <a name="v0-24-1" href="#v0-24-1">v0.24.1</a> [(2019-02-11)](https://github.com/nodegit/nodegit/releases/tag/v0.24.1)
+
+[Full Changelog](https://github.com/nodegit/nodegit/compare/v0.24.0...v0.24.1)
+
+#### Summary of changes
+- Fix Electron 4 builds
+
 ## <a name="v0-24-0" href="#v0-24-0">v0.24.0</a> [(2019-01-16)](https://github.com/nodegit/nodegit/releases/tag/v0.24.0)
 
 [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.23.0...v0.24.0)
diff --git a/appveyor.yml b/appveyor.yml
index 34f73e23d..368e911e8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -58,5 +58,6 @@ build: off
 
 branches:
   only:
+    - /backport\/.*/
     - master
     - v0.3
diff --git a/generate/templates/templates/binding.gyp b/generate/templates/templates/binding.gyp
index dc0e203e7..ac9de517f 100644
--- a/generate/templates/templates/binding.gyp
+++ b/generate/templates/templates/binding.gyp
@@ -1,21 +1,13 @@
 {
-  "conditions": [
-    ["(OS=='win' and node_root_dir.split('\\\\')[-1].startswith('iojs')) or (OS=='mac' and node_root_dir.split('/')[-1].startswith('iojs'))", {
-      "variables": {
-        "is_electron%": "1",
-      }
-    }, {
-      "variables": {
-        "is_electron%": "0",
-      }
-    }]
-  ],
+  "variables": {
+    "is_electron%": "<!(node ./utils/isBuildingForElectron.js <(node_root_dir))"
+  },
 
   "targets": [
     {
       "target_name": "acquireOpenSSL",
         "conditions": [
-        ["<(is_electron) == 1", {
+        ["<(is_electron) == 1 and OS != 'linux'", {
           "actions": [{
             "action_name": "acquire",
             "action": ["node", "utils/acquireOpenSSL.js"],
@@ -102,7 +94,7 @@
         [
           "OS=='mac'", {
             "conditions": [
-              ["node_root_dir.split('/')[-1].startswith('iojs')", {
+              ["<(is_electron) == 1", {
                 "include_dirs": [
                   "vendor/openssl/include"
                 ],
@@ -130,7 +122,7 @@
         [
           "OS=='win'", {
             "conditions": [
-              ["node_root_dir.split('\\\\')[-1].startswith('iojs')", {
+              ["<(is_electron) == 1", {
                 "include_dirs": ["vendor/openssl/include"],
                 "libraries": [
                   "<(module_root_dir)/vendor/openssl/lib/libcrypto.lib",
@@ -175,7 +167,7 @@
           }
         ],
         [
-          "OS.endswith('bsd') or (node_root_dir.split('/')[-1].startswith('iojs') and OS=='linux')", {
+          "OS.endswith('bsd') or (<(is_electron) == 1 and OS=='linux')", {
             "libraries": [
               "-lcrypto",
               "-lssl"
diff --git a/package-lock.json b/package-lock.json
index 7f93cb65c..7367d9b8a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "nodegit",
-  "version": "0.24.0",
+  "version": "0.24.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -258,6 +258,14 @@
         "private": "^0.1.8",
         "slash": "^1.0.0",
         "source-map": "^0.5.7"
+      },
+      "dependencies": {
+        "json5": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+          "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+          "dev": true
+        }
       }
     },
     "babel-generator": {
@@ -3230,10 +3238,19 @@
       "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
     "json5": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
-      "dev": true
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz",
+      "integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==",
+      "requires": {
+        "minimist": "^1.2.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+        }
+      }
     },
     "jsonfile": {
       "version": "2.4.0",
diff --git a/package.json b/package.json
index 8fc88751b..9678921b0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nodegit",
   "description": "Node.js libgit2 asynchronous native bindings",
-  "version": "0.24.0",
+  "version": "0.24.2",
   "homepage": "http://nodegit.org",
   "keywords": [
     "libgit2",
@@ -39,6 +39,7 @@
   },
   "dependencies": {
     "fs-extra": "^7.0.0",
+    "json5": "^2.1.0",
     "lodash": "^4.17.11",
     "nan": "^2.11.1",
     "node-gyp": "^3.8.0",
diff --git a/utils/isBuildingForElectron.js b/utils/isBuildingForElectron.js
new file mode 100644
index 000000000..295f6ab1f
--- /dev/null
+++ b/utils/isBuildingForElectron.js
@@ -0,0 +1,30 @@
+const fs = require("fs")
+const JSON5 = require("json5");
+const path = require("path");
+
+if (process.argv.length < 3) {
+  process.exit(1);
+}
+
+const last = arr => arr[arr.length - 1];
+const [, , nodeRootDir] = process.argv;
+
+let isElectron = last(nodeRootDir.split(path.sep)).startsWith("iojs");
+
+if (!isElectron) {
+  try {
+    // Not ideal, would love it if there were a full featured gyp package to do this operation instead.
+    const { variables: { built_with_electron } } = JSON5.parse(
+      fs.readFileSync(
+        path.resolve(nodeRootDir, "include", "node", "config.gypi"),
+        "utf8"
+      )
+    );
+
+    if (built_with_electron) {
+      isElectron = true;
+    }
+  } catch (e) {}
+}
+
+process.stdout.write(isElectron ? "1" : "0");
diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp
index 11904835e..835a73c71 100644
--- a/vendor/libgit2.gyp
+++ b/vendor/libgit2.gyp
@@ -7,6 +7,7 @@
     "library%": "static_library",
     "openssl_enable_asm%": 0, # only supported with the Visual Studio 2012 (VC11) toolchain.
     "gcc_version%": 0,
+    "is_electron%": "<!(node ../utils/isBuildingForElectron.js <(node_root_dir))",
     "is_clang%": 0
   },
   "targets": [
@@ -286,7 +287,7 @@
       "conditions": [
         ["OS=='mac'", {
             "conditions": [
-              ["node_root_dir.split('/')[-1].startswith('iojs')", {
+              ["<(is_electron) == 1", {
                 "include_dirs": [
                   "openssl/include"
                 ]
@@ -362,7 +363,7 @@
                   ],
                 },
               }],
-              ["node_root_dir.split('\\\\')[-1].startswith('iojs')", {
+              ["<(is_electron) == 1", {
                 "include_dirs": ["openssl/include"]
               }]
             ],
@@ -537,14 +538,14 @@
         ]
       },
       "conditions": [
-        ["OS=='mac' and node_root_dir.split('/')[-1].startswith('iojs')", {
+        ["OS=='mac' and <(is_electron) == 1", {
           "include_dirs": [
             "openssl/include",
           ]
         }],
         ["OS=='win'", {
           "conditions": [
-            ["node_root_dir.split('\\\\')[-1].startswith('iojs')", {
+            ["<(is_electron) == 1", {
               "include_dirs": [
                 "openssl/include"
               ],
diff --git a/vendor/static_config/openssl_distributions.json b/vendor/static_config/openssl_distributions.json
index f00384dd9..d42ecae15 100644
--- a/vendor/static_config/openssl_distributions.json
+++ b/vendor/static_config/openssl_distributions.json
@@ -1,18 +1,18 @@
 {
-  "macOS-clang-8.1-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/bd3cca94af79c6a2c35b664c43f643582a13a9f2/conan_package.tgz",
-  "macOS-clang-8.1-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/0197c20e330042c026560da838f5b4c4bf094b8a/conan_package.tgz",
-  "macOS-clang-9-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/85d674b0f6705cafe6b2edb8689ffbe0f3c2e60b/conan_package.tgz",
-  "macOS-clang-9-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/227fb0ea22f4797212e72ba94ea89c7b3fbc2a0c/conan_package.tgz",
-  "win32-vs12-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/39d6fe009a278f733e97b59a4f9536bfc4e8f366/conan_package.tgz",
-  "win32-vs12-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/d16d8a16b4cef0046922b8d83d567689d36149d0/conan_package.tgz",
-  "win32-vs14-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/889fd4ea9ba89fd6dc7fa32e2f45bd9804b85481/conan_package.tgz",
-  "win32-vs14-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/253958a6ce15f1c9325eeea33ffc0a5cfc29212a/conan_package.tgz",
-  "win32-vs15-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/05f648ec4d066b206769d6314e859fdd97a18f8d/conan_package.tgz",
-  "win32-vs15-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/a075e3ffc3590d6a920a26b4218b20253dd68d57/conan_package.tgz",
-  "win64-vs12-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/6bc3be0f39fdc624b24ba9bb00e8af55928d74e7/conan_package.tgz",
-  "win64-vs12-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/e942631065059eabe964ca471ad35bb453c15b31/conan_package.tgz",
-  "win64-vs14-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/867ca54360ed234a8bc9a6aa63806599ea29b38e/conan_package.tgz",
-  "win64-vs14-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/c4aef4edbc33205e0cf9b55bfb116b38c90ec132/conan_package.tgz",
-  "win64-vs15-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/0bd0c413b56aaec57c0f222a89b4e565a6729027/conan_package.tgz",
-  "win64-vs15-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/fce9be1511a149a4af36b5997f7e611ab83b2f58/conan_package.tgz"
-}
\ No newline at end of file
+  "macOS-clang-8.1-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/bd3cca94af79c6a2c35b664c43f643582a13a9f2/0/conan_package.tgz",
+  "macOS-clang-8.1-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/0197c20e330042c026560da838f5b4c4bf094b8a/0/conan_package.tgz",
+  "macOS-clang-9-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/85d674b0f6705cafe6b2edb8689ffbe0f3c2e60b/0/conan_package.tgz",
+  "macOS-clang-9-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/227fb0ea22f4797212e72ba94ea89c7b3fbc2a0c/0/conan_package.tgz",
+  "win32-vs12-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/39d6fe009a278f733e97b59a4f9536bfc4e8f366/0/conan_package.tgz",
+  "win32-vs12-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/d16d8a16b4cef0046922b8d83d567689d36149d0/0/conan_package.tgz",
+  "win32-vs14-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/889fd4ea9ba89fd6dc7fa32e2f45bd9804b85481/0/conan_package.tgz",
+  "win32-vs14-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/253958a6ce15f1c9325eeea33ffc0a5cfc29212a/0/conan_package.tgz",
+  "win32-vs15-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/05f648ec4d066b206769d6314e859fdd97a18f8d/0/conan_package.tgz",
+  "win32-vs15-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/a075e3ffc3590d6a920a26b4218b20253dd68d57/0/conan_package.tgz",
+  "win64-vs12-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/6bc3be0f39fdc624b24ba9bb00e8af55928d74e7/0/conan_package.tgz",
+  "win64-vs12-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/e942631065059eabe964ca471ad35bb453c15b31/0/conan_package.tgz",
+  "win64-vs14-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/867ca54360ed234a8bc9a6aa63806599ea29b38e/0/conan_package.tgz",
+  "win64-vs14-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/c4aef4edbc33205e0cf9b55bfb116b38c90ec132/0/conan_package.tgz",
+  "win64-vs15-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/0bd0c413b56aaec57c0f222a89b4e565a6729027/0/conan_package.tgz",
+  "win64-vs15-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/fce9be1511a149a4af36b5997f7e611ab83b2f58/0/conan_package.tgz"
+}