diff --git a/brightray/.gitmodules b/brightray/.gitmodules
index b5a3d92f902f..1e27bc6b5a21 100644
--- a/brightray/.gitmodules
+++ b/brightray/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "vendor/libchromiumcontent"]
 	path = vendor/libchromiumcontent
 	url = https://github.com/brightray/libchromiumcontent
+[submodule "vendor/gyp"]
+	path = vendor/gyp
+	url = https://github.com/svn2github/gyp
diff --git a/brightray/README.md b/brightray/README.md
index 8882bae914b8..deac3f13e710 100644
--- a/brightray/README.md
+++ b/brightray/README.md
@@ -14,7 +14,6 @@ sample application written using Brightray.
 ### Prerequisites
 
 * Python 2.7
-* gyp
 * Linux:
     * Clang 3.0
 * Mac:
diff --git a/brightray/script/build b/brightray/script/build
index 8e155d37fa67..b13f892b64f0 100755
--- a/brightray/script/build
+++ b/brightray/script/build
@@ -6,9 +6,7 @@ import sys
 
 
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
-GYP = {
-    'win32': 'gyp.bat',
-}.get(sys.platform, 'gyp')
+GYP = os.path.join(SOURCE_ROOT, 'vendor', 'gyp', 'gyp_main.py')
 
 
 def main():
@@ -17,7 +15,7 @@ def main():
 
 
 def run_gyp():
-    return subprocess.call([GYP, '--depth', '.', 'brightray.gyp'])
+    return subprocess.call([sys.executable, GYP, '--depth', '.', 'brightray.gyp'])
 
 
 def build():
diff --git a/brightray/vendor/gyp b/brightray/vendor/gyp
new file mode 160000
index 000000000000..6633baab29b6
--- /dev/null
+++ b/brightray/vendor/gyp
@@ -0,0 +1 @@
+Subproject commit 6633baab29b60f27e3dca607ffbef689ccdd82b8