diff --git a/JDK-8201788-arm-bootcycle-jobs.patch b/JDK-8201788-arm-bootcycle-jobs.patch
deleted file mode 100644
index 8ca10e0..0000000
--- a/JDK-8201788-arm-bootcycle-jobs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -r 21b063d75b3e make/Init.gmk
---- jdk9/make/Init.gmk	Thu Mar 16 16:34:33 2017 +0000
-+++ jdk9/make/Init.gmk	Tue Apr 04 13:49:37 2017 +0100
-@@ -303,7 +303,8 @@
- 	    $(call PrepareSmartJavac)
- 	    ( cd $(TOPDIR) && \
- 	        $(NICE) $(MAKE) $(MAKE_ARGS) $(OUTPUT_SYNC_FLAG) \
--	            -j $(JOBS) -f make/Main.gmk $(USER_MAKE_VARS) \
-+	            $(if $(DISABLE_JOBS),, -j $(JOBS)) \
-+	            -f make/Main.gmk $(USER_MAKE_VARS) \
- 	            $(PARALLEL_TARGETS) $(COMPARE_BUILD_MAKE) $(BUILD_LOG_PIPE) || \
- 	        ( exitcode=$$? && \
- 	        $(PRINTF) "\nERROR: Build failed for $(TARGET_DESCRIPTION) (exit code $$exitcode) \n" \
-diff -r 21b063d75b3e make/Main.gmk
---- jdk9/make/Main.gmk	Thu Mar 16 16:34:33 2017 +0000
-+++ jdk9/make/Main.gmk	Tue Apr 04 13:49:37 2017 +0100
-@@ -320,7 +320,7 @@
-         ifneq ($(COMPILE_TYPE), cross)
- 	  $(call LogWarn, Boot cycle build step 2: Building a new JDK image using previously built image)
- 	  +$(MAKE) $(MAKE_ARGS) -f $(SRC_ROOT)/make/Init.gmk PARALLEL_TARGETS=$(BOOTCYCLE_TARGET) \
--	      JOBS= SPEC=$(dir $(SPEC))bootcycle-spec.gmk main
-+	      DISABLE_JOBS=true SPEC=$(dir $(SPEC))bootcycle-spec.gmk main
-         else
- 	  $(call LogWarn, Boot cycle build disabled when cross compiling)
-         endif
diff --git a/JDK-8201788-bootcycle-images-jobs.patch b/JDK-8201788-bootcycle-images-jobs.patch
new file mode 100644
index 0000000..a4a4504
--- /dev/null
+++ b/JDK-8201788-bootcycle-images-jobs.patch
@@ -0,0 +1,18 @@
+diff -r 21b063d75b3e make/Init.gmk
+--- jdk9/make/Init.gmk	Thu Mar 16 16:34:33 2017 +0000
++++ jdk9/make/Init.gmk	Tue Apr 04 13:49:37 2017 +0100
+@@ -310,9 +310,13 @@
+           ifneq ($(PARALLEL_TARGETS), )
+ 	    $(call StartGlobalTimer)
+ 	    $(call PrepareSmartJavac)
++            # JOBS will only be empty for a bootcycle-images recursive call
++            # or if specified via a make argument directly. In those cases
++            # treat it as NOT using jobs at all.
+ 	    ( cd $(TOPDIR) && \
+ 	        $(NICE) $(MAKE) $(MAKE_ARGS) $(OUTPUT_SYNC_FLAG) \
+-	            -j $(JOBS) -f make/Main.gmk $(USER_MAKE_VARS) \
++                    $(if $(JOBS), -j $(JOBS)) \
++	            -f make/Main.gmk $(USER_MAKE_VARS) \
+ 	            $(PARALLEL_TARGETS) $(COMPARE_BUILD_MAKE) $(BUILD_LOG_PIPE) || \
+ 	        ( exitcode=$$? && \
+ 	        $(PRINTF) "\nERROR: Build failed for $(TARGET_DESCRIPTION) (exit code $$exitcode) \n" \
diff --git a/java-9-openjdk.spec b/java-9-openjdk.spec
index 2eb7f0b..3b53091 100644
--- a/java-9-openjdk.spec
+++ b/java-9-openjdk.spec
@@ -860,7 +860,7 @@ Provides: java-%{javaver}-%{origin}-accessiblity = %{epoch}:%{version}-%{release
 
 Name:    java-%{majorver}-%{origin}
 Version: %{newjavaver}.%{buildver}
-Release: 8%{?dist}
+Release: 9%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -938,9 +938,9 @@ Patch100: JDK-8201495-s390-java-opts.patch
 Patch101: sorted-diff.patch
 # Type fixing for s390 (Zero). Not upstream.
 Patch102: java-9-openjdk-size_t.patch
-# Arm (32 bit JIT) does not bootcycle without this fix.
-# Pending upstream.
-Patch103: JDK-8201788-arm-bootcycle-jobs.patch
+# bootcycle-images target may run out of ressources
+# due to bad jobs config. Missing backports.
+Patch103: JDK-8201788-bootcycle-images-jobs.patch
 # s390 (Zero) build fix. Pending upstream.
 Patch104: JDK-8201509-s390-atomic_store.patch
 
@@ -1833,6 +1833,11 @@ require "copy_jdk_configs.lua"
 
 
 %changelog
+* Fri Apr 20 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:9.0.4.12-9
+- Rename JDK-8201788-arm-bootcycle-jobs.patch =>
+  JDK-8201788-bootcycle-images-jobs.patch.
+- Refresh with pushed fix upstream.
+
 * Wed Apr 18 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:9.0.4.11-8
 - Add Zero build fixes for ppc (32 bit) Zero and s390 (32 bit) Zero:
   JDK-8185723-zero-atomic_copy64-ppc1.patch,