diff --git a/common.gypi b/common.gypi
index 3736ec5af13..1e399772811 100644
--- a/common.gypi
+++ b/common.gypi
@@ -38,7 +38,7 @@
 
     # Reset this number to 0 on major V8 upgrades.
     # Increment by one for each non-official patch applied to deps/v8.
-    'v8_embedder_string': '-node.11',
+    'v8_embedder_string': '-node.12',
 
     ##### V8 defaults for Node.js #####
 
diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp
index dd0f6799d5a..1c219fad50f 100644
--- a/deps/v8/gypfiles/v8.gyp
+++ b/deps/v8/gypfiles/v8.gyp
@@ -222,7 +222,7 @@
       'dependencies': [
         'v8_base',
       ],
-       'variables': {
+      'variables': {
         'optimize': 'max',
       },
       'include_dirs': [
@@ -359,16 +359,20 @@
         }],
         # Platforms that don't have Compare-And-Swap support need to link atomic
         # library to implement atomic memory access
-        [ 'v8_current_cpu == "mips" or v8_current_cpu == "mipsel" or '
-          'v8_current_cpu == "mips64" or v8_current_cpu == "mips64el" or '
-          'v8_current_cpu == "ppc" or v8_current_cpu == "ppc64" or '
-          'v8_current_cpu == "s390" or v8_current_cpu == "s390x"',
-          {
+        [ 'v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc", "ppc64", "s390", "s390x"]', {
             'link_settings': {
               'libraries': [ '-latomic', ],
             },
           },
         ],
+        ['OS=="win" and node_use_pch == "true"', {
+          'msvs_precompiled_header': '../../../tools/msvs/pch/v8_pch.h',
+          'msvs_precompiled_source': '../../../tools/msvs/pch/v8_pch.cc',
+          'sources': [
+            '<(_msvs_precompiled_header)',
+            '<(_msvs_precompiled_source)',
+           ],
+        }],
       ],
     }, # v8_initializers
     {
@@ -1942,10 +1946,11 @@
               # See http://crbug.com/485155.
               'msvs_shard': 4,
             }, {
-              'msvs_precompiled_header': 'tools/msvs/pch/pch_v8_base.h',
-              'msvs_precompiled_source': '../../../tools/msvs/pch/pch_v8_base.cc',
+              'msvs_precompiled_header': '../../../tools/msvs/pch/v8_pch.h',
+              'msvs_precompiled_source': '../../../tools/msvs/pch/v8_pch.cc',
               'sources': [
-                '../../../tools/msvs/pch/pch_v8_base.cc',
+                '<(_msvs_precompiled_header)',
+                '<(_msvs_precompiled_source)',
               ],
             }],
           ],
diff --git a/tools/msvs/pch/pch_v8_base.cc b/tools/msvs/pch/pch_v8_base.cc
deleted file mode 100644
index d0666ed3d4f..00000000000
--- a/tools/msvs/pch/pch_v8_base.cc
+++ /dev/null
@@ -1 +0,0 @@
-#include "pch_v8_base.h"
diff --git a/tools/msvs/pch/v8_pch.cc b/tools/msvs/pch/v8_pch.cc
new file mode 100644
index 00000000000..03a5d999d36
--- /dev/null
+++ b/tools/msvs/pch/v8_pch.cc
@@ -0,0 +1 @@
+#include "v8_pch.h"
diff --git a/tools/msvs/pch/pch_v8_base.h b/tools/msvs/pch/v8_pch.h
similarity index 100%
rename from tools/msvs/pch/pch_v8_base.h
rename to tools/msvs/pch/v8_pch.h