diff --git a/common.gypi b/common.gypi
index 0eaf3a31e99..b2ee5e50811 100644
--- a/common.gypi
+++ b/common.gypi
@@ -46,7 +46,7 @@
   # Settings to compile node under Windows.
   'target_defaults': {
     'target_conditions': [
-      ['_target_name in ["libuv", "http_parser", "openssl", "cares", "node", "zlib"]', {
+      ['_target_name in ["libuv", "http_parser", "openssl", "openssl-cli", "cares", "node", "zlib"]', {
         'msvs_disabled_warnings': [
           4003,  # not enough actual parameters for macro 'V'
           4013,  # 'free' undefined; assuming extern returning int
diff --git a/vendor/native_mate b/vendor/native_mate
index a1efa285204..b611cbb75f3 160000
--- a/vendor/native_mate
+++ b/vendor/native_mate
@@ -1 +1 @@
-Subproject commit a1efa285204cb2fbbed450c317fb535a38ea8480
+Subproject commit b611cbb75f35b89d4b7e86735432abe5ed059de3