diff --git a/glassfish-jaxb-api.spec b/glassfish-jaxb-api.spec
index 35e4f7d..acbab78 100644
--- a/glassfish-jaxb-api.spec
+++ b/glassfish-jaxb-api.spec
@@ -1,9 +1,8 @@
 %global oname jaxb-api
 Name:          glassfish-jaxb-api
 Version:       2.2.9
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       Java Architecture for XML Binding
-Group:         Development/Libraries
 License:       CDDL or GPLv2 with exception
 URL:           http://jaxb.java.net/
 # jaxb api and impl have different version
@@ -13,20 +12,14 @@ Source0:       http://repo1.maven.org/maven2/javax/xml/bind/%{oname}/%{version}/
 Source1:       http://repo1.maven.org/maven2/javax/xml/bind/%{oname}/%{version}/%{oname}-%{version}.pom
 
 BuildRequires: java-devel >= 1:1.6.0
-
 BuildRequires: java-javadoc
 BuildRequires: jvnet-parent
 
 BuildRequires: maven-local
-BuildRequires: maven-compiler-plugin
 BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
 BuildRequires: maven-plugin-bundle
 BuildRequires: maven-resources-plugin
 BuildRequires: maven-shared-osgi
-BuildRequires: maven-surefire-plugin
-
 Requires:      java >= 1:1.6.0
 Requires:      jvnet-parent
 BuildArch:     noarch
@@ -39,7 +32,6 @@ BuildArch:     noarch
 Glassfish - JAXB (JSR 222) API.
 
 %package javadoc
-Group:         Documentation
 Summary:       Javadoc for %{oname}
 Requires:      %{name} = %{version}-%{release} 
 
@@ -66,29 +58,25 @@ sed -i 's|<location>${basedir}/offline-javadoc</location>|<location>%{_javadocdi
 
 %build
 
-mvn-rpmbuild package javadoc:javadoc
+%mvn_file :%{oname} %{oname}
+%mvn_build
 
 %install
+%mvn_install
 
-mkdir -p %{buildroot}%{_javadir}
-install -m 644 target/%{oname}-%{version}.jar %{buildroot}%{_javadir}/%{oname}.jar
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{oname}.pom
-%add_maven_depmap JPP-%{oname}.pom %{oname}.jar
+mv %{buildroot}%{_javadocdir}/%{name} \
+ %{buildroot}%{_javadocdir}/%{oname}
 
-mkdir -p %{buildroot}%{_javadocdir}/%{oname}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{oname}
-
-%files
-%{_javadir}/%{oname}.jar
-%{_mavenpomdir}/JPP-%{oname}.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
 
 %files javadoc
 %{_javadocdir}/%{oname}
 
 %changelog
+* Sat Jul 06 2013 gil cattaneo <puntogil@libero.it> 2.2.9-3
+- switch to XMvn
+- minor changes to adapt to current guideline
+
 * Mon Jun 10 2013 Orion Poplawski <orion@cora.nwra.com> 2.2.9-2
 - Add requires jvnet-parent