diff --git a/Makefile b/Makefile
index f3cf43d0830d..c724fd644e02 100644
--- a/Makefile
+++ b/Makefile
@@ -361,7 +361,6 @@ ifeq ($(DESTCPU),x86)
 V8_ARCH=ia32
 else
 V8_ARCH ?= $(DESTCPU)
-
 endif
 
 # enforce "x86" over "ia32" as the generally accepted way of referring to 32-bit intel
diff --git a/common.gypi b/common.gypi
index 811a7b3da3d5..ba916f6ae61a 100644
--- a/common.gypi
+++ b/common.gypi
@@ -36,10 +36,15 @@
       ['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 e30fce5e2159..300ff5b6d7cc 100755
--- a/configure
+++ b/configure
@@ -712,6 +712,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/node.gyp b/node.gyp
index bbd814e7b0d8..506b1c25bf03 100644
--- a/node.gyp
+++ b/node.gyp
@@ -108,8 +108,8 @@
       'dependencies': [
         'node_js2c#host',
         'deps/cares/cares.gyp:cares',
-        '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)',
@@ -686,12 +686,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.