diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index c19abdd..69205ce 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -14,7 +14,7 @@
 
 Name:           javapackages-tools
 Version:        5.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Macros and scripts for Java packaging support
 License:        BSD
 URL:            https://github.com/fedora-java/javapackages
@@ -110,6 +110,12 @@ Obsoletes:      python-javapackages < %{version}-%{release}
 %description -n javapackages-local
 This package provides non-essential macros and scripts 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.
+
 %prep
 %setup -q -n javapackages-%{version}
 %patch0 -p1
@@ -134,9 +140,7 @@ sed -i 's|mvn_build.py|& --xmvn-javadoc|' $(find %{buildroot} -name 'macros*.fja
 sed -e 's/.[17]$/&*/' -i files-*
 
 mkdir -p %{buildroot}%{_datadir}/xmvn/config.d/
-%if 0%{?_module_build}
-sed 's/@{mns}/%{mns}/g' %{SOURCE1} >%{buildroot}%{_datadir}/xmvn/config.d/module-config.xml
-%endif
+sed s/@{mns}/maven-3.6/g %{SOURCE1} >%{buildroot}%{_datadir}/xmvn/config.d/module-maven-3.6.xml
 
 rm -rf %{buildroot}%{_bindir}/gradle-local
 rm -rf %{buildroot}%{_datadir}/gradle-local
@@ -146,7 +150,6 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7
 ./check
 
 %files -f files-tools
-%{_datadir}/xmvn/config.d
 
 %files -n javapackages-filesystem -f files-filesystem
 
@@ -156,10 +159,15 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7
 
 %files -n maven-local
 
-
 %files -n ivy-local -f files-ivy
 
+%files -n javapackages-config-maven-3.6
+%{_datadir}/xmvn/config.d
+
 %changelog
+* Fri Jun 28 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-2
+- Introduce javapackages-config-maven-3.6
+
 * Fri Jun 14 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-1
 - Update to upstream version 5.3.1
 
diff --git a/module-config.xml b/module-config.xml
index 8319c2e..4b56094 100644
--- a/module-config.xml
+++ b/module-config.xml
@@ -1,4 +1,14 @@
 <configuration>
+  <artifactManagement>
+    <rule>
+      <artifactGlob>
+        <artifactId>{*}</artifactId>
+      </artifactGlob>
+      <files>
+        <file>@{mns}/@1</file>
+      </files>
+    </rule>
+  </artifactManagement>
   <repositories>
     <repository>
       <id>install-@{mns}</id>