diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp
index d5316e05f92a..83b325d447d4 100644
--- a/brightray/brightray.gyp
+++ b/brightray/brightray.gyp
@@ -92,10 +92,23 @@
         'common/main_delegate.h',
         'common/main_delegate_mac.mm',
       ],
-      'link_settings': {
-        'libraries': [ '<@(libchromiumcontent_libraries)' ]
-      },
       'conditions': [
+        ['OS=="linux" and libchromiumcontent_component==0', {
+          # On Linux we have to use "--whole-archive" to force executable
+          # to include all symbols, otherwise we will have plenty of
+          # unresolved symbols errors.
+          'direct_dependent_settings': {
+            'ldflags': [
+              '-Wl,--whole-archive',
+              '<@(libchromiumcontent_libraries)',
+              '-Wl,--no-whole-archive',
+            ],
+          }
+        }, {
+          'link_settings': {
+            'libraries': [ '<@(libchromiumcontent_libraries)' ]
+          },
+        }],
         ['OS=="linux"', {
           'cflags_cc': [
             '-Wno-deprecated-register',
@@ -121,6 +134,16 @@
               'link_settings': {
                 'libraries': [
                   '<(libchromiumcontent_dir)/libboringssl.so',
+                  '-lasound',
+                  '-lcap',
+                  '-lcups',
+                  '-lrt',
+                  '-ldl',
+                  '-lresolv',
+                  '-lfontconfig',
+                  '-lfreetype',
+                  '-lX11 -lXi -lXcursor -lXext -lXfixes -lXrender -lXcomposite -lXdamage -lXtst -lXrandr',
+                  '-lexpat',
                 ],
               },
             }],
diff --git a/brightray/vendor/libchromiumcontent b/brightray/vendor/libchromiumcontent
index c94e623f5951..09c2eb301ceb 160000
--- a/brightray/vendor/libchromiumcontent
+++ b/brightray/vendor/libchromiumcontent
@@ -1 +1 @@
-Subproject commit c94e623f5951db672958f10b098808fc2017ea40
+Subproject commit 09c2eb301ceb50f1ae01f9ba7af4a2adf77a4d87