diff --git a/.gitmodules b/.gitmodules
index 6164ed8b97..5bc253bad5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -12,7 +12,7 @@
 	url = https://github.com/electron/chromium-breakpad.git
 [submodule "vendor/native_mate"]
 	path = vendor/native_mate
-	url = https://github.com/zcbenz/native-mate.git
+	url = https://github.com/electron/native-mate.git
 [submodule "vendor/crashpad"]
 	path = vendor/crashpad
 	url = https://github.com/electron/crashpad.git
diff --git a/atom/common/api/atom_bindings.cc b/atom/common/api/atom_bindings.cc
index 27b3352f37..9173a10a38 100644
--- a/atom/common/api/atom_bindings.cc
+++ b/atom/common/api/atom_bindings.cc
@@ -112,6 +112,7 @@ void AtomBindings::BindTo(v8::Isolate* isolate,
 
   mate::Dictionary versions;
   if (dict.Get("versions", &versions)) {
+    // TODO(kevinsawicki): Make read-only in 2.0 to match node
     versions.Set(ATOM_PROJECT_NAME, ATOM_VERSION_STRING);
     versions.Set("chrome", CHROME_VERSION_STRING);
 
diff --git a/docs/tutorial/planned-breaking-changes.md b/docs/tutorial/planned-breaking-changes.md
index 681c66fc45..e2d0e3a939 100644
--- a/docs/tutorial/planned-breaking-changes.md
+++ b/docs/tutorial/planned-breaking-changes.md
@@ -87,6 +87,10 @@ process.versions['atom-shell']
 process.versions.electron
 ```
 
+* `process.versions.electron` and `process.version.chrome` will be made
+  read-only properties for consistency with the other `process.versions`
+  properties set by Node.
+
 ## `Tray`
 
 ```js
diff --git a/spec/node-spec.js b/spec/node-spec.js
index d6151175d1..e92b2a0d25 100644
--- a/spec/node-spec.js
+++ b/spec/node-spec.js
@@ -290,4 +290,12 @@ describe('node feature', function () {
       require('vm').runInNewContext('')
     })
   })
+
+  it('includes the electron version in process.versions', () => {
+    assert(/^\d+\.\d+\.\d+$/.test(process.versions.electron))
+  })
+
+  it('includes the chrome version in process.versions', () => {
+    assert(/^\d+\.\d+\.\d+\.\d+$/.test(process.versions.chrome))
+  })
 })