diff --git a/maven-shade-plugin.spec b/maven-shade-plugin.spec
index 76d0f83..f7beb79 100644
--- a/maven-shade-plugin.spec
+++ b/maven-shade-plugin.spec
@@ -1,42 +1,32 @@
 Name:           maven-shade-plugin
 Version:        2.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        This plugin provides the capability to package the artifact in an uber-jar
-
-Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/%{name}
 Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
+BuildArch:      noarch
 
-BuildArch: noarch
+BuildRequires:  maven-local
+BuildRequires:  java-devel
+BuildRequires:  mvn(asm:asm)
+BuildRequires:  mvn(asm:asm-commons)
+BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-plugins)
+BuildRequires:  mvn(org.apache.maven.shared:maven-dependency-tree)
+BuildRequires:  mvn(org.apache.maven:maven-artifact)
+BuildRequires:  mvn(org.apache.maven:maven-compat)
+BuildRequires:  mvn(org.apache.maven:maven-core)
+BuildRequires:  mvn(org.apache.maven:maven-model)
+BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-component-annotations)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-container-default)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires:  mvn(org.jdom:jdom)
+BuildRequires:  mvn(org.vafer:jdependency)
 
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: jpackage-utils
-BuildRequires: plexus-utils
-BuildRequires: ant
-BuildRequires: maven-local
-BuildRequires: maven-wagon
-BuildRequires: plexus-container-default
-BuildRequires: plexus-containers-component-metadata
-BuildRequires: maven-install-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-plugin-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
-BuildRequires: maven-surefire-provider-junit4
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-plugin-testing-harness
-BuildRequires: jdependency >= 0.6
-BuildRequires: xmlunit
-Requires: ant
-Requires: maven
-Requires: jpackage-utils
-Requires: java >= 1:1.6.0
-Requires: jdependency >= 0.6
-
-Obsoletes: maven2-plugin-shade <= 0:2.0.8
-Provides: maven2-plugin-shade = 1:%{version}-%{release}
+Obsoletes:      maven2-plugin-shade <= 0:2.0.8
+Provides:       maven2-plugin-shade = 1:%{version}-%{release}
 
 %description
 This plugin provides the capability to package the artifact in an
@@ -45,48 +35,34 @@ packages of some of the dependencies.
 
 
 %package javadoc
-Group:          Documentation
 Summary:        API documentation for %{name}
-Requires:       jpackage-utils
 
 %description javadoc
 %{summary}.
 
 %prep
 %setup -q
-
 rm src/test/jars/plexus-utils-1.4.1.jar
 ln -s $(build-classpath plexus/utils) src/test/jars/plexus-utils-1.4.1.jar
 
 %build
 # A class from aopalliance is not found. Simply adding BR does not solve it
-mvn-rpmbuild install javadoc:aggregate -Dmaven.test.skip
+%mvn_build -f
 
 %install
-# jars
-install -Dpm 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
+%mvn_install
 
-# poms
-install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
-%add_maven_depmap
-
-# javadoc
-install -dm 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-
-%files
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%files -f .mfiles
+%dir %{_javadir}/%{name}
 %doc LICENSE NOTICE
 
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE NOTICE
 
 %changelog
+* Wed Apr 10 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-4
+- Build with xmvn
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild