diff --git a/common.gypi b/common.gypi
index ac06e55b181e..ab96102d6ab1 100644
--- a/common.gypi
+++ b/common.gypi
@@ -36,10 +36,16 @@
       ['GENERATOR == "ninja" or OS== "mac"', {
         'OBJ_DIR': '<(PRODUCT_DIR)/obj',
         'V8_BASE': '<(PRODUCT_DIR)/libv8_base.a',
-      }, {
+        }],
+        ['GENERATOR != "ninja" and OS!= "mac" and target_arch not in "s390 s390x"', {
+
         'OBJ_DIR': '<(PRODUCT_DIR)/obj.target',
         'V8_BASE': '<(PRODUCT_DIR)/obj.target/deps/v8/tools/gyp/libv8_base.a',
       }],
+      ['GENERATOR != "ninja" and OS!= "mac" and target_arch in "s390 s390x"', {
+        'OBJ_DIR': '<(PRODUCT_DIR)/obj.target',
+        'V8_BASE': '<(PRODUCT_DIR)/obj.target/deps/v8z/tools/gyp/libv8_base.a',
+      }],
       ['openssl_fips != ""', {
         'OPENSSL_PRODUCT': 'libcrypto.a',
       }, {
diff --git a/configure b/configure
index 03a889d04a40..4fc43ac4ebb4 100755
--- a/configure
+++ b/configure
@@ -733,6 +733,11 @@ def configure_node(o):
   else:
     o['variables']['node_enable_v8_vtunejit'] = 'false'
 
+  if target_arch in ('s390', 's390x'):
+    o['variables']['v8_parent_path'] = 'deps/v8z'
+  else:
+    o['variables']['v8_parent_path'] = 'deps/v8'
+
   if flavor in ('solaris', 'mac', 'linux', 'freebsd'):
     use_dtrace = not options.without_dtrace
     # Don't enable by default on linux and freebsd
diff --git a/lib/internal/v8_prof_processor.js b/lib/internal/v8_prof_processor.js
index c84b3104d201..1d62f6f39e14 100644
--- a/lib/internal/v8_prof_processor.js
+++ b/lib/internal/v8_prof_processor.js
@@ -1,15 +1,15 @@
 const scriptFiles = [
   'internal/v8_prof_polyfill',
-  'v8/tools/splaytree',
-  'v8/tools/codemap',
-  'v8/tools/csvparser',
-  'v8/tools/consarray',
-  'v8/tools/profile',
-  'v8/tools/profile_view',
-  'v8/tools/logreader',
-  'v8/tools/tickprocessor',
-  'v8/tools/SourceMap',
-  'v8/tools/tickprocessor-driver'
+  v8_parent_path + '/tools/splaytree',
+  v8_parent_path + '/tools/codemap',
+  v8_parent_path + '/tools/csvparser',
+  v8_parent_path + '/tools/consarray',
+  v8_parent_path + '/tools/profile',
+  v8_parent_path + '/tools/profile_view',
+  v8_parent_path + '/tools/logreader',
+  v8_parent_path + '/tools/tickprocessor',
+  v8_parent_path + '/tools/SourceMap',
+  v8_parent_path + '/tools/tickprocessor-driver'
 ];
 var script = '';
 
diff --git a/node.gyp b/node.gyp
index 0e9fe40c419a..518f27403a51 100644
--- a/node.gyp
+++ b/node.gyp
@@ -88,16 +88,16 @@
       'lib/internal/v8_prof_polyfill.js',
       'lib/internal/v8_prof_processor.js',
       'lib/internal/streams/lazy_transform.js',
-      'deps/v8/tools/splaytree.js',
-      'deps/v8/tools/codemap.js',
-      'deps/v8/tools/consarray.js',
-      'deps/v8/tools/csvparser.js',
-      'deps/v8/tools/profile.js',
-      'deps/v8/tools/profile_view.js',
-      'deps/v8/tools/logreader.js',
-      'deps/v8/tools/tickprocessor.js',
-      'deps/v8/tools/SourceMap.js',
-      'deps/v8/tools/tickprocessor-driver.js',
+      '<(v8_parent_path)/tools/splaytree.js',
+      '<(v8_parent_path)/tools/codemap.js',
+      '<(v8_parent_path)/tools/consarray.js',
+      '<(v8_parent_path)/tools/csvparser.js',
+      '<(v8_parent_path)/tools/profile.js',
+      '<(v8_parent_path)/tools/profile_view.js',
+      '<(v8_parent_path)/tools/logreader.js',
+      '<(v8_parent_path)/tools/tickprocessor.js',
+      '<(v8_parent_path)/tools/SourceMap.js',
+      '<(v8_parent_path)/tools/tickprocessor-driver.js',
     ],
   },
 
@@ -108,8 +108,8 @@
 
       'dependencies': [
         'node_js2c#host',
-        'deps/v8/tools/gyp/v8.gyp:v8',
-        'deps/v8/tools/gyp/v8.gyp:v8_libplatform'
+        '<(v8_parent_path)/tools/gyp/v8.gyp:v8',
+        '<(v8_parent_path)/tools/gyp/v8.gyp:v8_libplatform'
       ],
 
       'include_dirs': [
@@ -117,7 +117,7 @@
         'tools/msvs/genfiles',
         'deps/uv/src/ares',
         '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h
-        'deps/v8' # include/v8_platform.h
+        '<(v8_parent_path)' # include/v8_platform.h
       ],
 
       'sources': [
@@ -195,8 +195,8 @@
         'src/util.cc',
         'src/string_search.cc',
         'deps/http_parser/http_parser.h',
-        'deps/v8/include/v8.h',
-        'deps/v8/include/v8-debug.h',
+        '<(v8_parent_path)/include/v8.h',
+        '<(v8_parent_path)/include/v8-debug.h',
         '<(SHARED_INTERMEDIATE_DIR)/node_natives.h',
         # javascript files to make for an even more pleasant IDE experience
         '<@(library_files)',
@@ -246,7 +246,7 @@
            target_arch=="ia32" or target_arch=="x32")', {
           'defines': [ 'NODE_ENABLE_VTUNE_PROFILING' ],
           'dependencies': [
-            'deps/v8/src/third_party/vtune/v8vtune.gyp:v8_vtune'
+            '<(v8_parent_path)/src/third_party/vtune/v8vtune.gyp:v8_vtune'
           ],
         }],
         [ 'node_use_openssl=="true"', {
@@ -371,7 +371,7 @@
           'defines': [ 'NODE_NO_BROWSER_GLOBALS' ],
         } ],
         [ 'v8_postmortem_support=="true"', {
-          'dependencies': [ 'deps/v8/tools/gyp/v8.gyp:postmortem-metadata' ],
+          'dependencies': [ '<(v8_parent_path)/tools/gyp/v8.gyp:postmortem-metadata' ],
           'conditions': [
             # -force_load is not applicable for the static library
             [ 'node_target_type!="static_library"', {
@@ -690,12 +690,12 @@
       'type': 'executable',
       'dependencies': [
         'deps/gtest/gtest.gyp:gtest',
-        'deps/v8/tools/gyp/v8.gyp:v8',
-        'deps/v8/tools/gyp/v8.gyp:v8_libplatform'
+        '<(v8_parent_path)/tools/gyp/v8.gyp:v8',
+        '<(v8_parent_path)/tools/gyp/v8.gyp:v8_libplatform'
       ],
       'include_dirs': [
         'src',
-        'deps/v8/include'
+        '<(v8_parent_path)/include'
       ],
       'defines': [
         # gtest's ASSERT macros conflict with our own.
@@ -722,7 +722,7 @@
 
           'include_dirs': [
             'src',
-            'deps/v8/include',
+            '<(v8_parent_path)/include',
           ],
 
           'sources': [