diff --git a/xmvn-tools.spec b/xmvn-tools.spec
index 7c309e2..8eebbad 100644
--- a/xmvn-tools.spec
+++ b/xmvn-tools.spec
@@ -38,7 +38,7 @@ BuildRequires:  atinject
 BuildRequires:  beust-jcommander >= 1.82
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  modello >= 2.0.0
 BuildRequires:  objectweb-asm
 BuildRequires:  sisu-inject
@@ -158,19 +158,6 @@ find -name ResolverIntegrationTest.java -delete
 rm -f xmvn-core/src/test/java/org/fedoraproject/xmvn/resolver/JavaHomeResolverTest.java
 %endif
 
-for i in api core; do
-  %pom_xpath_inject "pom:project" "
-     <groupId>org.fedoraproject.xmvn</groupId>
-     <version>%{version}</version>" %{parent}-${i}
-  %pom_remove_parent %{parent}-${i}
-done
-for i in install resolve subst; do
-  %pom_xpath_inject "pom:project" "
-     <groupId>org.fedoraproject.xmvn</groupId>
-     <version>%{version}</version>" %{parent}-tools/%{parent}-${i}
-  %pom_remove_parent %{parent}-tools/%{parent}-${i}
-done
-
 %build
 mkdir -p lib
 build-jar-repository -s lib \
@@ -197,11 +184,11 @@ done
 # poms
 install -dm 0755 %{buildroot}%{_mavenpomdir}/%{parent}
 for i in api core; do
-  install -pm 0644 %{parent}-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{parent}/%{parent}-${i}.pom
+  %{mvn_install_pom} %{parent}-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{parent}/%{parent}-${i}.pom
   %add_maven_depmap %{parent}/%{parent}-${i}.pom %{parent}/%{parent}-${i}.jar -f ${i}
 done
 for i in install resolve subst; do
-  install -pm 0644 %{parent}-tools/%{parent}-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{parent}/%{parent}-${i}.pom
+  %{mvn_install_pom} %{parent}-tools/%{parent}-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{parent}/%{parent}-${i}.pom
   %add_maven_depmap %{parent}/%{parent}-${i}.pom %{parent}/%{parent}-${i}.jar -f ${i}
 done