diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes
index 6bae4a6..3d390fd 100644
--- a/java-1_8_0-openjdk.changes
+++ b/java-1_8_0-openjdk.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Feb  1 12:54:10 UTC 2017 - fstrba@suse.com
+
+- Don't run bootstrap build for s390, since it is broken, instead
+  introduce a little cycle on this platform, in order to have
+  working openjdk8
+
 -------------------------------------------------------------------
 Sun Jan 29 20:44:57 UTC 2017 - fstrba@suse.com
 
diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index 11cddba..4112fa6 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -50,6 +50,11 @@
 # real file made by update-ca-certificates
 %global javacacerts %{_var}/lib/ca-certificates/java-cacerts
 # turn zero on non jit arches by default
+%ifarch s390
+%global _with_bootstrap 0
+%else
+%bcond_without bootstrap
+%endif
 %ifnarch %{jit_arches}
 %global _with_zero 1
 %endif
@@ -214,7 +219,6 @@ BuildRequires:  freetype2-devel
 BuildRequires:  gcc-c++
 BuildRequires:  giflib-devel
 BuildRequires:  gtk2-devel
-BuildRequires:  java-bootstrap-devel >= 1.7.0
 BuildRequires:  libjpeg-devel
 BuildRequires:  liblcms2-devel
 BuildRequires:  libpng-devel
@@ -261,6 +265,11 @@ Provides:       jre1.6.x
 Provides:       jre1.7.x
 Provides:       jre1.8.x
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if %{with bootstrap}
+BuildRequires:  java-bootstrap-devel >= 1.7.0
+%else
+BuildRequires:  java-1_8_0-openjdk-devel
+%endif
 %if %{with_system_kerberos}
 BuildRequires:  krb5-devel
 %endif
@@ -473,7 +482,11 @@ sh autogen.sh
 %if %{with_sunec}
         --enable-sunec \
 %endif
+%if %{with bootstrap}
         --enable-bootstrap \
+%else
+        --disable-bootstrap \
+%endif
         --disable-downloading \
         --with-abs-install-dir=%{_jvmdir}/%{sdkdir} \
 %ifnarch %{arm} %{aarch64}