diff --git a/xmlstreambuffer.spec b/xmlstreambuffer.spec
index 6822b36..648e68e 100644
--- a/xmlstreambuffer.spec
+++ b/xmlstreambuffer.spec
@@ -1,8 +1,7 @@
 Name:          xmlstreambuffer
 Version:       1.5.1
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       XML Stream Buffer
-Group:         Development/Libraries
 License:       CDDL or GPLv2 with exceptions
 Url:           http://java.net/projects/xmlstreambuffer/
 # svn export https://svn.java.net/svn/xmlstreambuffer~svn/tags/streambuffer-1.5.1/ xmlstreambuffer-1.5.1
@@ -19,13 +18,7 @@ BuildRequires: java-devel
 BuildRequires: jvnet-parent
 
 BuildRequires: maven-local
-BuildRequires: maven-compiler-plugin
 BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
 BuildRequires: maven-surefire-provider-junit4
 
 BuildRequires: bea-stax-api
@@ -35,10 +28,6 @@ BuildRequires: stax-ex >= 1.7.1
 BuildRequires: junit
 BuildRequires: woodstox-core
 
-Requires:      bea-stax-api
-Requires:      stax-ex >= 1.7.1
-
-Requires:      java
 BuildArch:     noarch
 
 %description
@@ -63,7 +52,6 @@ Stream buffers may be used as an efficient alternative to DOM where:
  SAX or StAX.
 
 %package javadoc
-Group:         Documentation
 Summary:       Javadoc for %{name}
 
 %description javadoc
@@ -78,33 +66,25 @@ sed -i "s|<artifactId>wstx-asl</artifactId>|<artifactId>woodstox-core-asl</artif
 cp -p %{SOURCE1} LICENSE.txt
 sed -i 's/\r//' LICENSE.txt
 
+%mvn_file :streambuffer %{name}
+
 %build
 
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
 
 %install
+%mvn_install
 
-mkdir -p %{buildroot}%{_javadir}
-install -pm 644 target/streambuffer-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
 %doc LICENSE.txt
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files -f .mfiles-javadoc
 %doc LICENSE.txt
 
 %changelog
+* Sat Jun 29 2013 gil cattaneo <puntogil@libero.it> 1.5.1-2
+- switch to XMvn, minor changes to adapt to current guideline
+
 * Tue Oct 30 2012 gil cattaneo <puntogil@libero.it> 1.5.1-1
 - update to 1.5.1