diff --git a/src/gyp/common_win.gypi b/src/gyp/common_win.gypi
index 3383b3a1b..32efbe5c0 100644
--- a/src/gyp/common_win.gypi
+++ b/src/gyp/common_win.gypi
@@ -135,6 +135,9 @@
             'UACExecutionLevel': '0',  # level="asInvoker"
             'UACUIAccess': 'false',    # uiAccess="false"
             'MinimumRequiredVersion': '10.0',
+            'AdditionalOptions': [
+              '/CETCOMPAT',
+            ],
           },
         },
         'msvs_configuration_attributes': {
@@ -158,6 +161,9 @@
           },
           'VCLinkerTool': {
             'TargetMachine': '<(win_target_machine_x64)',
+            'AdditionalOptions': [
+              '/CETCOMPAT',
+            ],
           },
         },
       },
@@ -338,9 +344,6 @@
           'user32.lib',
           'uuid.lib',
         ],
-        'AdditionalOptions': [
-          '/CETCOMPAT',
-        ],
         'DataExecutionPrevention': '2',        # /NXCOMPAT
         'EnableCOMDATFolding': '2',            # /OPT:ICF
         'GenerateDebugInformation': 'true',    # /DEBUG