diff --git a/maven-plugin-testing.spec b/maven-plugin-testing.spec
index 0fc58b6..0889952 100644
--- a/maven-plugin-testing.spec
+++ b/maven-plugin-testing.spec
@@ -1,58 +1,36 @@
-%global ver_suffix -alpha-1
-
 Name:           maven-plugin-testing
 Version:        2.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Maven Plugin Testing
-
-Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugin-testing/
-
 Source0:        http://repo1.maven.org/maven2/org/apache/maven/plugin-testing/%{name}/%{version}/%{name}-%{version}-source-release.zip
-
 BuildArch: noarch
 
 BuildRequires: easymock2
 BuildRequires: junit
 BuildRequires: java-devel
 BuildRequires: maven-local
-BuildRequires: maven-install-plugin
-BuildRequires: maven-compiler-plugin
 BuildRequires: maven-resources-plugin
-BuildRequires: maven-jar-plugin
 BuildRequires: maven-source-plugin
-BuildRequires: maven-site-plugin
 BuildRequires: plexus-containers-component-metadata
 BuildRequires: maven-javadoc-plugin
 BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-surefire-plugin
-BuildRequires: maven-surefire-provider-junit
 BuildRequires: maven-shared-reporting-impl
-BuildRequires: maven-test-tools
-
-Requires: maven
-Requires: jpackage-utils
-Requires: java
+#BuildRequires: maven-test-tools
 
 %description
 The Maven Plugin Testing contains the necessary modules
 to be able to test Maven Plugins.
 
 %package javadoc
-Group:          Documentation
 Summary:        Javadoc for %{name}
-Requires:       jpackage-utils
 
 %description javadoc
 API documentation for %{name}.
 
 %package harness
 Summary: Maven Plugin Testing Mechanism
-Group: Development/Libraries
-Requires: maven-plugin-testing = %{version}-%{release}
-Requires: plexus-archiver
-Requires: plexus-utils
 BuildRequires: maven-surefire-provider-junit4
 Obsoletes: maven-shared-plugin-testing-harness <= 0:1.2
 Provides: maven-shared-plugin-testing-harness = 1:%{version}-%{release}
@@ -62,10 +40,6 @@ The Maven Plugin Testing Harness provides mechanisms to manage tests on Mojo.
 
 %package tools
 Summary: Maven Plugin Testing Tools
-Group: Development/Libraries
-Requires: maven-plugin-testing = %{version}-%{release}
-Requires: maven-shared-invoker
-Requires: plexus-utils
 Obsoletes: maven-shared-plugin-testing-tools <= 0:%{version}-%{release}
 Provides: maven-shared-plugin-testing-tools = 1:%{version}-%{release}
 
@@ -74,10 +48,6 @@ A set of useful tools to help the Maven Plugin testing.
 
 %package -n maven-test-tools
 Summary: Maven Testing Tool
-Group: Development/Libraries
-Requires: maven-plugin-testing = %{version}-%{release}
-Requires: easymock2
-Requires: plexus-utils
 Obsoletes: maven-shared-test-tools <= 0:%{version}-%{release}
 Provides: maven-shared-test-tools = 1:%{version}-%{release}
 
@@ -88,59 +58,28 @@ Framework to test Maven Plugins with Easymock objects.
 %setup -q
 
 %build
+%mvn_alias : org.apache.maven.shared:
 # Tests are skipped due to some test failures most probably caused by issues 
 # with our plexus container
-mvn-rpmbuild install javadoc:aggregate -Dmaven.test.failure.ignore
+%mvn_build -f -s
 
 %install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}/%{name}
-install -m 644 maven-plugin-testing-harness/target/%{name}-harness-%{version}.jar  \
-                   %{buildroot}%{_javadir}/%{name}/%{name}-harness.jar
-install -m 644 maven-plugin-testing-tools/target/%{name}-tools-%{version}.jar \
-                 %{buildroot}%{_javadir}/%{name}/%{name}-tools.jar
-install -m 644 maven-test-tools/target/maven-test-tools-%{version}.jar  \
-       %{buildroot}%{_javadir}/%{name}/maven-test-tools.jar
+%mvn_install
 
-# poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom
-install -pm 644 maven-plugin-testing-harness/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-harness.pom
-install -pm 644 maven-plugin-testing-tools/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-tools.pom
-install -pm 644 maven-test-tools/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-maven-test-tools.pom
-
-# javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
-
-%add_maven_depmap -a "org.apache.maven.shared:%{name}" JPP.%{name}-%{name}.pom
-%add_maven_depmap -f harness -a "org.apache.maven.shared:%{name}-harness" JPP.%{name}-%{name}-harness.pom %{name}/%{name}-harness.jar
-%add_maven_depmap -f tools -a "org.apache.maven.shared:%{name}-tools" JPP.%{name}-%{name}-tools.pom %{name}/%{name}-tools.jar
-%add_maven_depmap -f maven-test-tools -a "org.apache.maven.shared:maven-test-tools" JPP.%{name}-maven-test-tools.pom %{name}/maven-test-tools.jar
-
-%files
-%{_mavenpomdir}/JPP.%{name}-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
-
-%files javadoc
-%{_javadocdir}/*
-
-%files harness
-%{_javadir}/%{name}/%{name}-harness.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-harness.pom
-%{_mavendepmapfragdir}/%{name}-harness
-
-%files tools
-%{_javadir}/%{name}/%{name}-tools.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-tools.pom
-%{_mavendepmapfragdir}/%{name}-tools
-
-%files -n maven-test-tools
-%{_javadir}/%{name}/maven-test-tools.jar
-%{_mavenpomdir}/JPP.%{name}-maven-test-tools.pom
-%{_mavendepmapfragdir}/%{name}-maven-test-tools
+%files -f .mfiles-%{name}
+%doc LICENSE NOTICE
+%files harness -f .mfiles-%{name}-harness
+%files tools -f .mfiles-%{name}-tools
+%files -n maven-test-tools -f .mfiles-maven-test-tools
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE NOTICE
 
 %changelog
+* Mon Mar 11 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1-5
+- Install missing license files
+- Build with xmvn
+- Resolves: rhbz#920258
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild