diff --git a/maven-dependency-analyzer.spec b/maven-dependency-analyzer.spec
index 828db8b..5d4d58d 100644
--- a/maven-dependency-analyzer.spec
+++ b/maven-dependency-analyzer.spec
@@ -1,34 +1,22 @@
 Name:           maven-dependency-analyzer
 Version:        1.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Maven dependency analyzer
-
 License:        ASL 2.0
 URL:            http://maven.apache.org/shared/maven-dependency-analyzer/
 Source0:        http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
+BuildArch:      noarch
 
-BuildRequires:  java-devel
-BuildRequires:  jpackage-utils
-# Needed just for tests, those are skipped
-#BuildRequires:  jmock
+BuildRequires:  maven-local
+BuildRequires:  maven-shared
 BuildRequires:  httpcomponents-project
 BuildRequires:  maven-doxia-module-xhtml
-BuildRequires:  junit
-BuildRequires:  maven-local
 BuildRequires:  maven-plugin-testing-tools
-Requires:       objectweb-asm
-Requires:       java
-Requires:       jpackage-utils
-Requires:       maven
-Requires:       maven-project
-Requires:       plexus-containers-component-annotations
-Requires:       plexus-utils
-
-BuildArch:      noarch
 
 # This is a replacement package for maven-shared-dependency-analyzer
 Provides:       maven-shared-dependency-analyzer = %{version}-%{release}
 Obsoletes:      maven-shared-dependency-analyzer < %{version}-%{release}
+
 %description
 Analyzes the dependencies of a project for undeclared or unused artifacts.
 
@@ -39,8 +27,6 @@ dependency.
 
 %package javadoc
 Summary:        API documentation for %{name}
-Group:          Documentation
-Requires:       jpackage-utils
 
 %description javadoc
 %{summary}
@@ -54,33 +40,21 @@ Requires:       jpackage-utils
 
 %build
 # org.jmock.core package is needed, we don't have it
-mvn-rpmbuild install javadoc:aggregate -Dmaven.test.skip
+%mvn_build -f
 
 %install
-# jars
-install -d -m 755 %{buildroot}%{_javadir}
-install -pm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-# pom
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
+%mvn_install
 
-# javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
+%files -f .mfiles
 %doc LICENSE NOTICE
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE NOTICE
-%{_javadocdir}/%{name}
 
 %changelog
+* Tue Feb 19 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3-7
+- Build with xmvn
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild