diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index a545c5e..b06cac5 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -443,11 +443,7 @@ sh autogen.sh
 %if %{with_sunec}
         --enable-sunec \
 %endif
-%ifarch s390
-        --disable-bootstrap \
-%else
         --enable-bootstrap \
-%endif
         --disable-infinality \
         --disable-downloading \
         --with-abs-install-dir=%{_jvmdir}/%{sdkdir} \
@@ -501,9 +497,7 @@ patch -p0 -i %{PATCH103}
  bash ./autogen.sh
 )
 
-ulimit -c unlimited
-make %{?_smp_mflags} || make %{?_smp_mflags} || make %{?_smp_mflags} || make %{?_smp_mflags} || make %{?_smp_mflags} \
-	|| make %{?_smp_mflags} || make %{?_smp_mflags} || make %{?_smp_mflags} || make %{?_smp_mflags}
+make %{?_smp_mflags}
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}images/j2sdk-image