diff --git a/maven-jar-plugin-maven-core-dep.patch b/maven-jar-plugin-maven-core-dep.patch
deleted file mode 100644
index ba528dc..0000000
--- a/maven-jar-plugin-maven-core-dep.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/pom.xml b/pom.xml
-index f5732ad..68aa1d8 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -71,6 +71,11 @@ under the License.
-   <dependencies>
-     <dependency>
-       <groupId>org.apache.maven</groupId>
-+      <artifactId>maven-core</artifactId>
-+      <version>${mavenVersion}</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.apache.maven</groupId>
-       <artifactId>maven-plugin-api</artifactId>
-       <version>${mavenVersion}</version>
-     </dependency>
diff --git a/maven-jar-plugin.spec b/maven-jar-plugin.spec
index f90a7a6..1dcfbea 100644
--- a/maven-jar-plugin.spec
+++ b/maven-jar-plugin.spec
@@ -1,45 +1,25 @@
 Name:           maven-jar-plugin
 Version:        2.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Maven JAR Plugin
 
-Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-jar-plugin/
 Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
 
-# Some classes from maven-artifact come in maven-core, added a dep in pom.xml
-Patch0:         %{name}-maven-core-dep.patch
-
 BuildArch: noarch
 
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: javapackages-tools >= 0.7.0
-BuildRequires: maven-local
-BuildRequires: maven-plugin-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-surefire-plugin
-BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-plugin-testing-harness
-BuildRequires: maven-archiver
-BuildRequires: plexus-archiver
-BuildRequires: apache-commons-lang
-BuildRequires: plexus-utils
-BuildRequires: junit
-Requires: maven
-Requires: maven-archiver
-Requires: plexus-archiver
-Requires: maven-archiver
-Requires: apache-commons-lang
-Requires: plexus-utils
-Requires: maven-plugin-testing-harness
-Requires: junit
-Requires: java
+BuildRequires:  maven-local
+BuildRequires:  mvn(commons-lang:commons-lang)
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.maven:maven-archiver)
+BuildRequires:  mvn(org.apache.maven:maven-artifact)
+BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
+BuildRequires:  mvn(org.apache.maven:maven-project)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-plugins)
+BuildRequires:  mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-archiver)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
 
 Provides:       maven2-plugin-jar = %{version}-%{release}
 Obsoletes:      maven2-plugin-jar <= 0:2.0.8
@@ -49,9 +29,7 @@ Builds a Java Archive (JAR) file from the compiled
 project classes and resources.
 
 %package javadoc
-Group:          Documentation
 Summary:        Javadoc for %{name}
-Requires:       jpackage-utils
 
 %description javadoc
 API documentation for %{name}.
@@ -59,38 +37,26 @@ API documentation for %{name}.
 
 %prep
 %setup -q
-%patch0 -p1
-
-#let plexus-container-default be retrieved as a dependency
-sed -i -e "s|plexus-container-default|plexus-container|g" pom.xml
 
 %build
 # Test class MockArtifact doesn't override method getMetadata
-mvn-rpmbuild install javadoc:aggregate -Dmaven.test.skip
+%mvn_build -f
 
 %install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
-
-# poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml \
-    %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
+%mvn_install
 
 %files -f .mfiles
+%dir %{_javadir}/%{name}
 %doc LICENSE NOTICE
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE NOTICE
-%{_javadocdir}/%{name}
 
 %changelog
+* Mon Sep 23 2013 Michal Srb <msrb@redhat.com> - 2.4-7
+- Migrate to XMvn
+- Remove unneeded patch
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild