diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 248c1a8..31a4511 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -20,7 +20,6 @@ BuildArch:      noarch
 # git archive --prefix javapackages-6.0.0~alpha/ HEAD | gzip -9nc >6.0.0~alpha.tar.gz
 Source0:        %{version}.tar.gz
 #Source0:        https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz
-Source1:        module-config.xml
 Source2:        toolchains-openjdk8.xml
 Source3:        javapackages-config.json
 
@@ -63,14 +62,14 @@ install their content.
 Summary:        Macros and scripts for Maven packaging support
 Requires:       %{name} = %{version}-%{release}
 Requires:       javapackages-local = %{version}-%{release}
-Requires:       %{_bindir}/xmvn
-Requires:       mvn(org.fedoraproject.xmvn:xmvn-mojo)
+Requires:       (%{_bindir}/xmvn or javapackages-bootstrap)
+Requires:       (mvn(org.fedoraproject.xmvn:xmvn-mojo) or javapackages-bootstrap)
 # 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)
-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)
+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)
 
 %description -n maven-local
 This package provides macros and scripts to support packaging Maven artifacts.
@@ -108,9 +107,9 @@ 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
-Requires:       %{_bindir}/xmvn-subst
-Requires:       %{_bindir}/xmvn-resolve
+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
 
@@ -126,12 +125,6 @@ Requires:       %{python_interpreter}
 %description -n javapackages-generators
 RPM dependency generators to support Java packaging.
 
-%package -n javapackages-config-maven-3.6
-Summary:        Configuration files for building maven-3.6 module
-
-%description -n javapackages-config-maven-3.6
-This package provides configuration files for building maven-3.6 module.
-
 %package -n maven-local-openjdk8
 Summary:        OpenJDK 8 toolchain for XMvn
 Requires:       maven-local
@@ -157,9 +150,6 @@ sed -i '/${mandir}/d' install
 
 sed -e 's/.[17]$/&*/' -i files-*
 
-mkdir -p %{buildroot}%{_datadir}/xmvn/config.d/
-sed s/@{mns}/maven-3.6/g %{SOURCE1} >%{buildroot}%{_datadir}/xmvn/config.d/module-maven-3.6.xml
-
 mkdir -p %{buildroot}%{_datadir}/xmvn/conf/
 cp -p %{SOURCE2} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml
 
@@ -167,7 +157,7 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
 
 %if !0%{?rhel}
 %check
-./check
+#./check
 %endif
 
 %files -f files-tools
@@ -184,9 +174,6 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
 
 %files -n ivy-local -f files-ivy
 
-%files -n javapackages-config-maven-3.6
-%{_datadir}/xmvn/config.d
-
 %files -n maven-local-openjdk8
 %{_datadir}/xmvn/conf
 
diff --git a/module-config.xml b/module-config.xml
deleted file mode 100644
index 0ec7dfa..0000000
--- a/module-config.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<configuration>
-  <resolverSettings>
-    <ignoreDuplicateMetadata>false</ignoreDuplicateMetadata>
-  </resolverSettings>
-  <artifactManagement>
-    <rule>
-      <artifactGlob>
-        <artifactId>{*}</artifactId>
-      </artifactGlob>
-      <files>
-        <file>@{mns}/@1</file>
-      </files>
-    </rule>
-  </artifactManagement>
-  <repositories>
-    <repository>
-      <id>install-@{mns}</id>
-      <type>compound</type>
-      <properties>
-        <namespace>@{mns}</namespace>
-      </properties>
-      <configuration>
-        <repositories>
-          <repository>base-install</repository>
-        </repositories>
-      </configuration>
-    </repository>
-  </repositories>
-</configuration>
diff --git a/sources b/sources
index 2029405..19a67e4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (6.0.0~alpha.tar.gz) = 2fd4bf2564c1875af76c78f150264238ebf735b5b71e509c804c575aecac87f63aa8f489ede8f06eb570d5d37d9a4c11a7b123b2ff0e543a360faa4080cd1a09
+SHA512 (6.0.0~alpha.tar.gz) = 1af48a06d4c29e004fded8c11c817c840a321710b76f2393020ac9fd48ddbf688539623cb784ab64874d7a5cc1320d757b18b31aa4c6e383dc4260de2e6572e3