diff --git a/atom.gyp b/atom.gyp
index 37df94de212..01993ad8f15 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -181,6 +181,8 @@
       'atom/browser/ui/x/x_window_utils.h',
       'atom/browser/web_view/web_view_manager.cc',
       'atom/browser/web_view/web_view_manager.h',
+      'atom/browser/web_view/web_view_renderer_state.cc',
+      'atom/browser/web_view/web_view_renderer_state.h',
       'atom/browser/window_list.cc',
       'atom/browser/window_list.h',
       'atom/browser/window_list_observer.h',
diff --git a/atom/browser/atom_browser_client.cc b/atom/browser/atom_browser_client.cc
index 3b99903f35a..7045a09924a 100644
--- a/atom/browser/atom_browser_client.cc
+++ b/atom/browser/atom_browser_client.cc
@@ -9,13 +9,14 @@
 #include "atom/browser/atom_browser_main_parts.h"
 #include "atom/browser/atom_speech_recognition_manager_delegate.h"
 #include "atom/browser/native_window.h"
+#include "atom/browser/web_view/web_view_renderer_state.h"
 #include "atom/browser/window_list.h"
+#include "atom/common/options_switches.h"
 #include "base/command_line.h"
 #include "chrome/browser/printing/printing_message_filter.h"
 #include "chrome/browser/speech/tts_message_filter.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
-#include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/web_preferences.h"
@@ -140,11 +141,17 @@ void AtomBrowserClient::AppendExtraCommandLineSwitches(
       window = *iter;
   }
 
-  if (window != NULL)
+  if (window != NULL) {
     window->AppendExtraCommandLineSwitches(command_line, child_process_id);
-  else
-    // If we can not find a owner window then it is a guest web view.
-    command_line->AppendSwitch("guest");
+  } else {
+    // Append commnad line arguments for guest web view.
+    WebViewRendererState::WebViewInfo info;
+    if (WebViewRendererState::GetInstance()->GetInfo(child_process_id, &info)) {
+      command_line->AppendSwitch("guest");
+      command_line->AppendSwitchASCII(switches::kNodeIntegration,
+                                      info.node_integration ? "true" : "false");
+    }
+  }
 
   dying_render_process_ = NULL;
 }
diff --git a/atom/browser/default_app/default_app.js b/atom/browser/default_app/default_app.js
index 14ca8719c55..269821d2a3d 100644
--- a/atom/browser/default_app/default_app.js
+++ b/atom/browser/default_app/default_app.js
@@ -16,7 +16,6 @@ app.on('ready', function() {
     width: 800,
     height: 600,
     resizable: false,
-    'node-integration': true,
     'auto-hide-menu-bar': true,
     'use-content-size': true,
     'web-preferences': {
diff --git a/atom/browser/default_app/index.html b/atom/browser/default_app/index.html
index db06acafc15..83b5122782f 100644
--- a/atom/browser/default_app/index.html
+++ b/atom/browser/default_app/index.html
@@ -56,8 +56,6 @@
   </style>
 </head>
 <body>
-  <webview id="foo" autosize src="http://www.baidu.com/" style="display:block; width:640px; height:100px"></webview>
-
   <script>
     var execPath = require('remote').process.execPath;
     var command = execPath + ' path-to-your-app';
diff --git a/atom/browser/lib/guest-view-manager.coffee b/atom/browser/lib/guest-view-manager.coffee
index d2ff96faab4..39d224594e8 100644
--- a/atom/browser/lib/guest-view-manager.coffee
+++ b/atom/browser/lib/guest-view-manager.coffee
@@ -33,7 +33,7 @@ createGuest = (embedder, params) ->
     guestInstanceId: id
     storagePartitionId: params.storagePartitionId
   guestInstances[id] = guest
-  webViewManager.addGuest id, embedder, guest
+  webViewManager.addGuest id, embedder, guest, params.nodeIntegration
 
   # Destroy guest when the embedder is gone.
   embedder.once 'render-view-deleted', ->
diff --git a/atom/browser/web_view/web_view_manager.cc b/atom/browser/web_view/web_view_manager.cc
index 3b639c9adcd..1372bc6938a 100644
--- a/atom/browser/web_view/web_view_manager.cc
+++ b/atom/browser/web_view/web_view_manager.cc
@@ -6,8 +6,11 @@
 
 #include "atom/browser/api/atom_api_web_contents.h"
 #include "atom/browser/atom_browser_context.h"
+#include "atom/browser/web_view/web_view_renderer_state.h"
 #include "base/bind.h"
 #include "base/stl_util.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/render_process_host.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
 
@@ -39,11 +42,29 @@ WebViewManager::~WebViewManager() {
 
 void WebViewManager::AddGuest(int guest_instance_id,
                               content::WebContents* embedder,
-                              content::WebContents* web_contents) {
-  web_contents_map_[guest_instance_id] = {web_contents, embedder};
+                              content::WebContents* web_contents,
+                              bool node_integration) {
+  web_contents_map_[guest_instance_id] = { web_contents, embedder };
+
+  WebViewRendererState::WebViewInfo web_view_info = { node_integration };
+  content::BrowserThread::PostTask(
+      content::BrowserThread::IO,
+      FROM_HERE,
+      base::Bind(&WebViewRendererState::AddGuest,
+                 base::Unretained(WebViewRendererState::GetInstance()),
+                 web_contents->GetRenderProcessHost()->GetID(),
+                 web_view_info));
 }
 
 void WebViewManager::RemoveGuest(int guest_instance_id) {
+  auto web_contents = web_contents_map_[guest_instance_id].web_contents;
+  content::BrowserThread::PostTask(
+      content::BrowserThread::IO, FROM_HERE,
+      base::Bind(
+          &WebViewRendererState::RemoveGuest,
+          base::Unretained(WebViewRendererState::GetInstance()),
+          web_contents->GetRenderProcessHost()->GetID()));
+
   web_contents_map_.erase(guest_instance_id);
 }
 
diff --git a/atom/browser/web_view/web_view_manager.h b/atom/browser/web_view/web_view_manager.h
index dd72f8ac526..058db0ca317 100644
--- a/atom/browser/web_view/web_view_manager.h
+++ b/atom/browser/web_view/web_view_manager.h
@@ -22,7 +22,8 @@ class WebViewManager : public content::BrowserPluginGuestManager {
 
   void AddGuest(int guest_instance_id,
                 content::WebContents* embedder,
-                content::WebContents* web_contents);
+                content::WebContents* web_contents,
+                bool node_integration);
   void RemoveGuest(int guest_instance_id);
 
  protected:
diff --git a/atom/browser/web_view/web_view_renderer_state.cc b/atom/browser/web_view/web_view_renderer_state.cc
new file mode 100644
index 00000000000..0c0e455f5cf
--- /dev/null
+++ b/atom/browser/web_view/web_view_renderer_state.cc
@@ -0,0 +1,46 @@
+// Copyright (c) 2014 GitHub, Inc. All rights reserved.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "atom/browser/web_view/web_view_renderer_state.h"
+
+#include "content/public/browser/browser_thread.h"
+
+namespace atom {
+
+// static
+WebViewRendererState* WebViewRendererState::GetInstance() {
+  return Singleton<WebViewRendererState>::get();
+}
+
+WebViewRendererState::WebViewRendererState() {
+}
+
+WebViewRendererState::~WebViewRendererState() {
+}
+
+bool WebViewRendererState::IsGuest(int render_process_id) {
+  return webview_info_map_.find(render_process_id) !=
+         webview_info_map_.end();
+}
+
+void WebViewRendererState::AddGuest(int guest_process_id,
+                                    const WebViewInfo& webview_info) {
+  webview_info_map_[guest_process_id] = webview_info;
+}
+
+void WebViewRendererState::RemoveGuest(int guest_process_id) {
+  webview_info_map_.erase(guest_process_id);
+}
+
+bool WebViewRendererState::GetInfo(int guest_process_id,
+                                   WebViewInfo* webview_info) {
+  WebViewInfoMap::iterator iter = webview_info_map_.find(guest_process_id);
+  if (iter != webview_info_map_.end()) {
+    *webview_info = iter->second;
+    return true;
+  }
+  return false;
+}
+
+}  // namespace atom
diff --git a/atom/browser/web_view/web_view_renderer_state.h b/atom/browser/web_view/web_view_renderer_state.h
new file mode 100644
index 00000000000..55306ec823f
--- /dev/null
+++ b/atom/browser/web_view/web_view_renderer_state.h
@@ -0,0 +1,55 @@
+// Copyright (c) 2014 GitHub, Inc. All rights reserved.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ATOM_BROWSER_WEB_VIEW_WEB_VIEW_RENDERER_STATE_H_
+#define ATOM_BROWSER_WEB_VIEW_WEB_VIEW_RENDERER_STATE_H_
+
+#include <map>
+#include <string>
+#include <utility>
+
+#include "base/memory/singleton.h"
+
+namespace atom {
+
+class WebViewManager;
+
+// This class keeps track of <webview> renderer state for use on the IO thread.
+// All methods should be called on the IO thread.
+class WebViewRendererState {
+ public:
+  struct WebViewInfo {
+    bool node_integration;
+  };
+
+  static WebViewRendererState* GetInstance();
+
+  // Looks up the information for the embedder <webview> for a given render
+  // view, if one exists. Called on the IO thread.
+  bool GetInfo(int guest_process_id, WebViewInfo* webview_info);
+
+  // Returns true if the given renderer is used by webviews.
+  bool IsGuest(int render_process_id);
+
+ private:
+  friend class WebViewManager;
+  friend struct DefaultSingletonTraits<WebViewRendererState>;
+
+  typedef std::map<int, WebViewInfo> WebViewInfoMap;
+
+  WebViewRendererState();
+  ~WebViewRendererState();
+
+  // Adds or removes a <webview> guest render process from the set.
+  void AddGuest(int render_process_id, const WebViewInfo& webview_info);
+  void RemoveGuest(int render_process_id);
+
+  WebViewInfoMap webview_info_map_;
+
+  DISALLOW_COPY_AND_ASSIGN(WebViewRendererState);
+};
+
+}  // namespace atom
+
+#endif  // ATOM_BROWSER_WEB_VIEW_WEB_VIEW_RENDERER_STATE_H_
diff --git a/atom/renderer/lib/web-view.coffee b/atom/renderer/lib/web-view.coffee
index e17267bc301..8061f9b049c 100644
--- a/atom/renderer/lib/web-view.coffee
+++ b/atom/renderer/lib/web-view.coffee
@@ -19,6 +19,7 @@ WEB_VIEW_ATTRIBUTE_MAXWIDTH = 'maxwidth'
 WEB_VIEW_ATTRIBUTE_MINHEIGHT = 'minheight'
 WEB_VIEW_ATTRIBUTE_MINWIDTH = 'minwidth'
 WEB_VIEW_ATTRIBUTE_PARTITION = 'partition'
+WEB_VIEW_ATTRIBUTE_NODEINTEGRATION = 'nodeintegration'
 AUTO_SIZE_ATTRIBUTES = [
   WEB_VIEW_ATTRIBUTE_AUTOSIZE,
   WEB_VIEW_ATTRIBUTE_MAXHEIGHT,
@@ -373,7 +374,9 @@ class WebView
     storagePartitionId =
       @webviewNode.getAttribute(WEB_VIEW_ATTRIBUTE_PARTITION) or
       @webviewNode[WEB_VIEW_ATTRIBUTE_PARTITION]
-    params = storagePartitionId: storagePartitionId
+    params =
+      storagePartitionId: storagePartitionId
+      nodeIntegration: @webviewNode.hasAttribute WEB_VIEW_ATTRIBUTE_NODEINTEGRATION
     guestViewInternal.createGuest 'webview', params, (guestInstanceId) =>
       @pendingGuestCreation = false
       unless @elementAttached
diff --git a/docs/api/web-view-tag.md b/docs/api/web-view-tag.md
index 28e9060fcf9..a7b908dee97 100644
--- a/docs/api/web-view-tag.md
+++ b/docs/api/web-view-tag.md
@@ -73,6 +73,15 @@ bounds specified by the attributes `minwidth`, `minheight`, `maxwidth`, and
 enabled. When `autosize` is enabled, the `webview` container size cannot be less
 than the minimum values or greater than the maximum.
 
+### nodeintegration
+
+```html
+<webview src="http://www.google.com/" nodeintegration></webview>
+```
+
+If "on", the guest page in `webview` will have node integration and can use node
+APIs like `require` and `process` to access low level system resources.
+
 ## Methods
 
 ### `<webview>`.getUrl()
