diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index 66cc569..f7e1501 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -29,8 +29,8 @@
 #use the standard one from java (temporarily)
 %bcond_with timezonejava
 
-%bcond_with binary
 %bcond_without clang
+%bcond_with bootstrap
 
 # The -g flag says to use strip -g instead of full strip on DSOs or EXEs.
 # This fixes detailed NMT and other tools which need minimal debug info.
@@ -125,13 +125,7 @@
 # is expected in one single case at the end of the build
 %global rev_build_loop  %{build_loop2} %{build_loop1}
 
-%ifarch %{jit_arches}
-%global bootstrap_build 1
-%else
-%global bootstrap_build 1
-%endif
-
-%if %{bootstrap_build}
+%if %{without bootstrap}
 %global release_targets bootcycle-images static-libs-image docs-zip
 %else
 %global release_targets images docs-zip static-libs-image
@@ -1551,7 +1545,7 @@ bash ../configure \
     --with-vendor-url="https://www.redhat.com/" \
     --with-vendor-bug-url="%{bugs}" \
     --with-vendor-vm-bug-url="%{bugs}" \
-%if ! %{with binary}
+%if ! %{with bootstrap}
     --with-boot-jdk=/usr/lib/jvm/java-%{buildjdkver}-openjdk \
 %else
     --with-boot-jdk="%{_builddir}/jdk-11.0.7+10" \