diff --git a/fusesource-pom.spec b/fusesource-pom.spec
index b066b9c..eaf5b4a 100644
--- a/fusesource-pom.spec
+++ b/fusesource-pom.spec
@@ -1,6 +1,6 @@
 Name:             fusesource-pom
 Version:          1.5
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Parent POM for FuseSource Maven projects
 Group:            Development/Libraries
 License:          ASL 2.0
@@ -32,15 +32,13 @@ Requires:         maven-resources-plugin
 Requires:         maven-source-plugin
 Requires:         maven-surefire-plugin
 # clirr-maven-plugin depdendency removed by patch
-Requires:         plexus-maven-plugin
+Requires:         plexus-containers-component-metadata
 Requires:         modello
 Requires:         maven-release-plugin
 Requires:         maven-scm
 
 Requires:         java
 Requires:         jpackage-utils
-Requires(post):   jpackage-utils
-Requires(postun): jpackage-utils
 
 %description
 This is a shared POM parent for FuseSource Maven projects
@@ -55,19 +53,17 @@ install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 
 # DEPMAP
-%add_to_maven_depmap org.fusesource %{name} %{version} JPP %{name}
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+%add_maven_depmap JPP-%{name}.pom
 
 %files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
 
 %changelog
+* Tue Dec 20 2011 Tomas Radej <tradej@redhat.com> - 1.5-2
+- Changed R on plexus-maven-plugin to component-metadata
+- Guidelines fixes
+
 * Fri May 27 2011 Marek Goldmann <mgoldman@redhat.com> 1.5-1
 - Initial packaging