diff --git a/configure b/configure
index e72f9ea208c..b18e476f177 100755
--- a/configure
+++ b/configure
@@ -208,11 +208,8 @@ def configure_v8(o):
     o['libraries'] += ['-L%s' % options.shared_v8_libpath]
   if options.shared_v8_libname:
     o['libraries'] += ['-l%s' % options.shared_v8_libname]
-  elif options.shared_v8:
-    o['libraries'] += ['-lv8']
   if options.shared_v8_includes:
     o['include_dirs'] += [options.shared_v8_includes]
-    o['variables']['node_shared_v8_includes'] = options.shared_v8_includes
 
 
 def configure_cares(o):
diff --git a/node.gyp b/node.gyp
index 151b47d35db..24f579e054e 100644
--- a/node.gyp
+++ b/node.gyp
@@ -54,6 +54,7 @@
 
       'dependencies': [
         'deps/http_parser/http_parser.gyp:http_parser',
+        'deps/v8/tools/gyp/v8.gyp:v8',
         'deps/uv/uv.gyp:uv',
         'deps/zlib/zlib.gyp:zlib',
         'node_js2c#host',
@@ -109,6 +110,8 @@
         'src/stream_wrap.h',
         'src/v8_typed_array.h',
         'deps/http_parser/http_parser.h',
+        'deps/v8/include/v8.h',
+        'deps/v8/include/v8-debug.h',
         '<(SHARED_INTERMEDIATE_DIR)/node_natives.h',
         # javascript files to make for an even more pleasant IDE experience
         '<@(library_files)',
@@ -144,21 +147,6 @@
           ],
         }],
 
-        [ 'node_shared_v8=="true"', {
-          'sources': [
-            '<(node_shared_v8_includes)/v8.h',
-            '<(node_shared_v8_includes)/v8-debug.h',
-          ],
-        }],
-
-        [ 'node_shared_v8=="false"', {
-          'sources': [
-            'deps/v8/include/v8.h',
-            'deps/v8/include/v8-debug.h',
-          ],
-          'dependencies': [ 'deps/v8/tools/gyp/v8.gyp:v8' ],
-        }],
-
         [ 'OS=="win"', {
           'sources': [
             'tools/msvs/res/node.rc',