diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index c844847..4338f21 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -10,7 +10,7 @@
 
 Name:           javapackages-tools
 Version:        6.0.0~alpha
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Macros and scripts for Java packaging support
 License:        BSD
 URL:            https://github.com/fedora-java/javapackages
@@ -61,14 +61,20 @@ install their content.
 Summary:        Macros and scripts for Maven packaging support
 Requires:       %{name} = %{version}-%{release}
 Requires:       javapackages-local = %{version}-%{release}
-Requires:       (%{_bindir}/xmvn or javapackages-bootstrap)
-Requires:       (mvn(org.fedoraproject.xmvn:xmvn-mojo) or javapackages-bootstrap)
+#Requires:       (%{_bindir}/xmvn or javapackages-bootstrap)
+#Requires:       (mvn(org.fedoraproject.xmvn:xmvn-mojo) or javapackages-bootstrap)
+Requires:       %{_bindir}/xmvn
+Requires:       mvn(org.fedoraproject.xmvn:xmvn-mojo
 # Common Maven plugins required by almost every build. It wouldn't make
 # sense to explicitly require them in every package built with Maven.
-Requires:       (mvn(org.apache.maven.plugins:maven-compiler-plugin) or javapackages-bootstrap)
-Requires:       (mvn(org.apache.maven.plugins:maven-jar-plugin) or javapackages-bootstrap)
-Requires:       (mvn(org.apache.maven.plugins:maven-resources-plugin) or javapackages-bootstrap)
-Requires:       (mvn(org.apache.maven.plugins:maven-surefire-plugin) or javapackages-bootstrap)
+#Requires:       (mvn(org.apache.maven.plugins:maven-compiler-plugin) or javapackages-bootstrap)
+#Requires:       (mvn(org.apache.maven.plugins:maven-jar-plugin) or javapackages-bootstrap)
+#Requires:       (mvn(org.apache.maven.plugins:maven-resources-plugin) or javapackages-bootstrap)
+#Requires:       (mvn(org.apache.maven.plugins:maven-surefire-plugin) or javapackages-bootstrap)
+Requires:       mvn(org.apache.maven.plugins:maven-compiler-plugin)
+Requires:       mvn(org.apache.maven.plugins:maven-jar-plugin)
+Requires:       mvn(org.apache.maven.plugins:maven-resources-plugin)
+Requires:       mvn(org.apache.maven.plugins:maven-surefire-plugin)
 
 %description -n maven-local
 This package provides macros and scripts to support packaging Maven artifacts.
@@ -95,9 +101,12 @@ packaging in Linux distributions
 %package -n javapackages-local
 Summary:        Non-essential macros and scripts for Java packaging support
 Requires:       javapackages-generators = %{version}-%{release}
-Requires:       (%{_bindir}/xmvn-install or javapackages-bootstrap)
-Requires:       (%{_bindir}/xmvn-subst or javapackages-bootstrap)
-Requires:       (%{_bindir}/xmvn-resolve or javapackages-bootstrap)
+#Requires:       (%{_bindir}/xmvn-install or javapackages-bootstrap)
+#Requires:       (%{_bindir}/xmvn-subst or javapackages-bootstrap)
+#Requires:       (%{_bindir}/xmvn-resolve or javapackages-bootstrap)
+Requires:       %{_bindir}/xmvn-install or javapackages-bootstrap
+Requires:       %{_bindir}/xmvn-subst or javapackages-bootstrap
+Requires:       %{_bindir}/xmvn-resolve or javapackages-bootstrap
 # Java build systems don't have hard requirement on java-devel, so it should be there
 Requires:       java-11-openjdk-devel
 
@@ -171,6 +180,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
 %license LICENSE
 
 %changelog
+* Thu May 13 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0~alpha-2
+- Disable javapackages-bootstrap for now
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.0-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild