diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec
index dc0e79a..d142219 100644
--- a/javapackages-bootstrap.spec
+++ b/javapackages-bootstrap.spec
@@ -6,10 +6,17 @@
 %global         __requires_exclude_from \\.jar$
 %global         __provides_exclude_from \\.jar$
 
+%if 0%{?_module_build}
+%global mavenHomePath %{_datadir}/xmvn
+%global metadataPath %{_datadir}/maven-metadata
+%global artifactsPath %{_javadir}
+%global launchersPath %{_bindir}
+%else
 %global mavenHomePath %{_datadir}/%{name}
 %global metadataPath %{mavenHomePath}/maven-metadata
 %global artifactsPath %{_javadir}
 %global launchersPath %{mavenHomePath}/bin
+%endif
 
 Name:           javapackages-bootstrap
 Version:        1.0.0
@@ -266,6 +273,13 @@ Requires:       coreutils
 Requires:       java-11-openjdk-devel
 Requires:       procps-ng
 
+%if 0%{?_module_build}
+Provides:       ant
+Provides:       ant-junit
+Provides:       java_cup
+Provides:       jflex
+%endif
+
 %description
 In a nutshell, Java Packages Bootstrap (JPB) is a standalone build of all Java
 software packages that are required for Java Packages Tools (JPT) to work.
@@ -406,6 +420,11 @@ install_license velocity-engine NOTICE
 install_license xbean NOTICE
 install_license xmvn NOTICE
 
+# Use toolchains.xml provided by javapackages-tools
+%if 0%{?_module_build}
+rm %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml
+%endif
+
 %files
 %{mavenHomePath}
 %{metadataPath}/*