diff --git a/Makefile b/Makefile
index 0e3f11e65172612c801cc94110884bddbf0959d6..8f351b75e3555154c4b223f69d445d988d823b06 100644
--- a/Makefile
+++ b/Makefile
@@ -86,10 +86,12 @@ ifneq ($(DEBUG_LEVEL), 2)
 OPT += -O2 -fno-omit-frame-pointer
 ifeq (,$(findstring ppc64,$(MACHINE))) # ppc64[le] doesn't support -momit-leaf-frame-pointer
 ifneq ($(MACHINE),armv7l)
+ifneq ($(MACHINE),s390x)
 OPT += -momit-leaf-frame-pointer
 endif
 endif
 endif
+endif
 
 # if we're compiling for release, compile without debug code (-DNDEBUG) and
 # don't treat warnings as errors
diff --git a/build_tools/build_detect_platform b/build_tools/build_detect_platform
index 5832b03a970c6b175628bd2f96f51adb159a7888..00fae78c590bc5e6eb998bd3d35de46949c7250b 100755
--- a/build_tools/build_detect_platform
+++ b/build_tools/build_detect_platform
@@ -360,6 +360,8 @@ fi
 if test "$USE_SSE"; then
   # if Intel SSE instruction set is supported, set USE_SSE=1
   COMMON_FLAGS="$COMMON_FLAGS -msse -msse4.2 "
+elif [ "$TARGET_ARCHITECTURE" = s390x ]; then
+  COMMON_FLAGS="$COMMON_FLAGS -march=z10 "
 elif test -z "$PORTABLE"; then
   if test -n "`echo $TARGET_ARCHITECTURE | grep ^ppc64`"; then
     # Tune for this POWER processor, treating '+' models as base models