diff --git a/plexus-compiler.spec b/plexus-compiler.spec
index 400380e..ad6a485 100644
--- a/plexus-compiler.spec
+++ b/plexus-compiler.spec
@@ -30,13 +30,12 @@ Source100:      %{name}-build.tar.xz
 BuildRequires:  ant
 BuildRequires:  ecj
 BuildRequires:  fdupes
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  plexus-classworlds
 BuildRequires:  plexus-containers-component-annotations
 BuildRequires:  plexus-containers-container-default
 BuildRequires:  plexus-metadata-generator
 BuildRequires:  plexus-utils
-Requires:       mvn(org.codehaus.plexus:plexus-utils)
 BuildArch:      noarch
 
 %description
@@ -83,13 +82,6 @@ cp %{SOURCE2} LICENSE.MIT
 
 %pom_remove_plugin :maven-site-plugin
 
-for i in plexus-compiler-api plexus-compiler-manager plexus-compiler-test \
-         plexus-compilers/plexus-compiler-csharp plexus-compilers/plexus-compiler-eclipse \
-		 plexus-compilers/plexus-compiler-javac plexus-compilers/plexus-compiler-j2objc; do
-  %pom_remove_parent ${i}
-  %pom_xpath_inject "pom:project" "<version>%{version}</version><groupId>org.codehaus.plexus</groupId>" ${i}
-done
-
 %build
 mkdir -p lib
 build-jar-repository -s lib plexus/utils plexus/classworlds \
@@ -118,14 +110,14 @@ install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
 for i in plexus-compilers/plexus-compiler-csharp \
 		 plexus-compilers/plexus-compiler-eclipse; do
   bsnm=$(basename ${i})
-  install -pm 0644 ${i}/pom.xml  %{buildroot}%{_mavenpomdir}/%{name}/$bsnm.pom
+  %{mvn_install_pom} ${i}/pom.xml  %{buildroot}%{_mavenpomdir}/%{name}/$bsnm.pom
   %add_maven_depmap %{name}/$bsnm.pom %{name}/$bsnm.jar -f extras
 done
 # These ones end-up in the main package
 for i in plexus-compiler-api plexus-compiler-manager \
          plexus-compilers/plexus-compiler-javac plexus-compilers/plexus-compiler-j2objc; do
   bsnm=$(basename ${i})
-  install -pm 0644 ${i}/pom.xml  %{buildroot}%{_mavenpomdir}/%{name}/$bsnm.pom
+  %{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$bsnm.pom
   %add_maven_depmap %{name}/$bsnm.pom %{name}/$bsnm.jar
 done