diff --git a/apache-commons-cli-build.xml b/apache-commons-cli-build.xml
index 76b91c7..5095940 100644
--- a/apache-commons-cli-build.xml
+++ b/apache-commons-cli-build.xml
@@ -70,7 +70,6 @@
              packagenames="*" 
              destdir="${reporting.outputDirectory}/apidocs" 
              access="protected" 
-             old="false" 
              verbose="false" 
              encoding="iso-8859-1" 
              version="true" 
diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec
index 9c993c1..469f140 100644
--- a/apache-commons-cli.spec
+++ b/apache-commons-cli.spec
@@ -31,7 +31,7 @@ Source2:        apache-commons-cli-rpmlintrc
 Patch0:         CLI-253-workaround.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 Provides:       jakarta-%{short_name} = %{version}-%{release}
 Obsoletes:      jakarta-%{short_name} < %{version}-%{release}
 Provides:       apache-cli = %{version}-%{release}
@@ -59,7 +59,7 @@ cp %{SOURCE1} build.xml
 %pom_remove_parent
 
 %build
-%ant package javadoc
+%{ant} package javadoc
 
 %install
 # jars
@@ -68,7 +68,7 @@ ln -sf %{short_name}.jar %{buildroot}%{_javadir}/%{name}.jar
 
 # pom
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom
 %add_maven_depmap %{short_name}.pom %{short_name}.jar -a "org.apache.commons:%{short_name}"
 
 # javadoc