diff --git a/atom.gyp b/atom.gyp
index 63bd60bea7..a74c42ed15 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -312,6 +312,17 @@
       'export_dependent_settings': [
         'vendor/brightray/brightray.gyp:brightray',
       ],
+      'conditions': [
+        ['OS=="win"', {
+          'link_settings': {
+            'libraries': [
+              '-limm32.lib',
+              '-loleacc.lib',
+              '<(atom_source_root)/<(libchromiumcontent_library_dir)/views_chromiumcontent.lib',
+            ],
+          },
+        }],
+      ],
     },
     {
       'target_name': 'generated_sources',
diff --git a/common.gypi b/common.gypi
index d36fb3fd3e..dc5168181d 100644
--- a/common.gypi
+++ b/common.gypi
@@ -66,6 +66,24 @@
       4800,  # (v8.h) forcing value to bool 'true' or 'false'
       4819,  # The file contains a character that cannot be represented in the current code page
     ],
+    'msvs_settings': {
+      'VCLinkerTool': {
+        'AdditionalOptions': [
+          # ATL 8.0 included in WDK 7.1 makes the linker to generate following
+          # warnings:
+          #   - warning LNK4254: section 'ATL' (50000040) merged into
+          #     '.rdata' (40000040) with different attributes
+          #   - warning LNK4078: multiple 'ATL' sections found with
+          #     different attributes
+          '/ignore:4254',
+          '/ignore:4078',
+          # views_chromiumcontent.lib generates this warning because it's
+          # symobls are defined as dllexport but used as static library:
+          #   - warning LNK4217: locally defined symbol imported in function
+          '/ignore:4217',
+        ],
+      },
+    },
   },
   'conditions': [
     # Settings to compile with clang under OS X.
diff --git a/vendor/brightray b/vendor/brightray
index 0805ba501c..111ca6ad83 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit 0805ba501cc9e9c4bf1cf1e265a782c53b2cc45f
+Subproject commit 111ca6ad837c25c5f0fa53299a7c67153d0dab8b