diff --git a/aether-ant-tasks.spec b/aether-ant-tasks.spec
index d3aedb1..a844241 100644
--- a/aether-ant-tasks.spec
+++ b/aether-ant-tasks.spec
@@ -1,6 +1,6 @@
 Name:           aether-ant-tasks
 Version:        1.0
-Release:        0.2.SNAPSHOT%{?dist}
+Release:        0.3.SNAPSHOT%{?dist}
 Summary:        Ant tasks using Aether to resolve, install and deploy artifacts
 Group:          Development/Libraries
 BuildArch:      noarch
@@ -12,11 +12,10 @@ URL:            https://github.com/sonatype/aether-ant-tasks
 Source0:        aether-ant-tasks.tar.bz2
 Source1:        http://www.eclipse.org/legal/epl-v10.html
 
+BuildRequires:  xmvn
+BuildRequires:  java-devel
 BuildRequires:  aether
 BuildRequires:  ant
-BuildRequires:  java
-BuildRequires:  jpackage-utils
-BuildRequires:  maven
 BuildRequires:  maven-error-diagnostics
 BuildRequires:  maven-invoker-plugin
 BuildRequires:  maven-shade-plugin
@@ -24,15 +23,6 @@ BuildRequires:  plexus-cipher
 BuildRequires:  plexus-interpolation
 BuildRequires:  plexus-sec-dispatcher
 
-Requires:       aether
-Requires:       ant
-Requires:       java
-Requires:       jpackage-utils
-Requires:       maven-model
-Requires:       plexus-cipher
-Requires:       plexus-interpolation
-Requires:       plexus-sec-dispatcher
-
 %description
 The Aether Ant Tasks enable build scripts for Apache Ant 1.7+ to use Sonatype
 Aether to resolve dependencies and install and deploy locally built artifacts.
@@ -40,7 +30,6 @@ Aether to resolve dependencies and install and deploy locally built artifacts.
 %package javadoc
 Summary:        Javadocs for %{name}
 Group:          Documentation
-Requires:       jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -51,32 +40,21 @@ cp -p %{SOURCE1} LICENSE
 
 %build
 # Tests are skipped because of missing dependency - mvn(junit:junit-dep)
-mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
+%mvn_build -f
 
 %install
-# jar
-install -dm 755 %{buildroot}%{_javadir}
-install -m 644 target/aether-ant-tasks-1.0-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}.jar
-# javadoc
-install -dm 755 %{buildroot}%{_javadocdir}
-cp -R target/site/apidocs %{buildroot}%{_javadocdir}/%{name}
-# pom
-install -dm 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%mvn_install
 
-%files
-%doc LICENSE
-%doc README.md
-%{_javadir}/%{name}.jar
-%{_mavendepmapfragdir}/%{name}
-%{_mavenpomdir}/JPP-%{name}.pom
+%files -f .mfiles
+%doc LICENSE README.md
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE
-%{_javadocdir}/%{name}
 
 %changelog
+* Tue Jan  8 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0-0.3.SNAPSHOT
+- Build with xmvn
+
 * Mon Sep 17 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0-0.2.SNAPSHOT
 - Install LICENSE files