diff --git a/.gitmodules b/.gitmodules
index 7b3e48f26652..5014273d2677 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "vendor/breakpad"]
 	path = vendor/breakpad
 	url = https://github.com/atom/chromium-breakpad.git
+[submodule "vendor/native_mate"]
+	path = vendor/native_mate
+	url = https://github.com/zcbenz/native-mate.git
diff --git a/atom.gyp b/atom.gyp
index 9ceabcb93927..e637a4d691db 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -1,5 +1,8 @@
 {
   'variables': {
+    'includes': [
+      'vendor/native_mate/native_mate_files.gypi',
+    ],
     'project_name': 'atom',
     'product_name': 'Atom',
     'framework_name': 'Atom Framework',
@@ -215,6 +218,7 @@
       'chrome/browser/ui/gtk/gtk_window_util.h',
       'chrome/browser/ui/gtk/menu_gtk.cc',
       'chrome/browser/ui/gtk/menu_gtk.h',
+      '<@(native_mate_files)',
     ],
     'framework_sources': [
       'atom/app/atom_library_main.cc',
@@ -371,6 +375,7 @@
       'include_dirs': [
         '.',
         'vendor/brightray',
+        'vendor/native_mate',
         # Include directories for uv and node.
         'vendor/node/src',
         'vendor/node/deps/http_parser',
diff --git a/vendor/native_mate b/vendor/native_mate
new file mode 160000
index 000000000000..4cada31f8089
--- /dev/null
+++ b/vendor/native_mate
@@ -0,0 +1 @@
+Subproject commit 4cada31f808994b297439dff429638debc4a4ee9