diff --git a/apache-commons-collections.spec b/apache-commons-collections.spec
index 6d9829b..af7c581 100644
--- a/apache-commons-collections.spec
+++ b/apache-commons-collections.spec
@@ -3,7 +3,7 @@
 
 Name:           apache-%{short_name}
 Version:        3.2.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Provides new interfaces, implementations and utilities for Java Collections
 License:        ASL 2.0
 Group:          Development/Libraries
@@ -20,25 +20,25 @@ BuildArch:      noarch
 BuildRequires: java-devel
 BuildRequires: jpackage-utils
 BuildRequires: maven2
-BuildRequires: maven2-plugin-antrun
-BuildRequires: maven2-plugin-assembly
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-idea
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-resources
+BuildRequires: maven-antrun-plugin
+BuildRequires: maven-assembly-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-idea-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-resources-plugin
 BuildRequires: maven-doxia-sitetools
 BuildRequires: maven-plugin-bundle
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
 BuildRequires: maven-surefire-provider-junit
 BuildRequires: ant
 BuildRequires: saxon
 BuildRequires: saxon-scripts
 Requires:      java
 Requires:      jpackage-utils
-Requires(post):jpackage-utils
-Requires(postun):jpackage-utils
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
 
 Provides:       jakarta-%{short_name} = %{version}-%{release}
 Obsoletes:      jakarta-%{short_name} < %{version}-%{release}
@@ -82,6 +82,8 @@ Obsoletes:      jakarta-%{short_name}-javadoc < %{version}-%{release}
 %package tomcat5
 Summary:        Jakarta Commons Collection dependency for Tomcat5
 Group:          Development/Libraries
+Provides:       jakarta-%{short_name}-tomcat5 = %{version}-%{release}
+Obsoletes:      jakarta-%{short_name}-tomcat5 < %{version}-%{release}
 
 %description tomcat5
 A package that is specifically designed to fulfill to a Tomcat5 dependency.
@@ -131,8 +133,8 @@ ant -f collections-tomcat5-build.xml
 rm -rf $RPM_BUILD_ROOT
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-maven-archiver.pom
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom
 %add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
 install -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 install -m 644 target/%{short_name}-testframework-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-testframework-%{version}.jar
@@ -166,7 +168,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc PROPOSAL.html README.txt LICENSE.txt RELEASE-NOTES.html NOTICE.txt
-%{_datadir}/maven2/poms/*
+%{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 %{_javadir}/%{name}-%{version}.jar
 %{_javadir}/%{name}.jar
@@ -196,6 +198,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}-testframework
 
 %changelog
+* Mon Oct 4 2010 Alexander Kurtakov <akurtako@redhat.com> 3.2.1-7
+- Fix pom name.
+- Use newer maven plugins names.
+
 * Tue Aug 30 2010 Carl Green <carlgreen at gmail.com> - 3.2.1-6
 - Change package to own files in directories, not the directories