diff --git a/tycho-extras.spec b/tycho-extras.spec
index 7323849..1734e01 100644
--- a/tycho-extras.spec
+++ b/tycho-extras.spec
@@ -4,10 +4,9 @@
 
 Name:           tycho-extras
 Version:        0.19.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Additional plugins for Tycho
 
-Group:          Development/Libraries
 License:        EPL
 URL:            http://eclipse.org/tycho/
 Source0:        http://git.eclipse.org/c/tycho/org.eclipse.tycho.extras.git/snapshot/tycho-extras-0.19.x.tar.bz2
@@ -20,10 +19,7 @@ BuildRequires:  jgit
 BuildRequires:  maven-local
 BuildRequires:  tycho
 
-Requires:       jpackage-utils
 Requires:       java-headless >= 1.5
-Requires:       jgit
-Requires:       tycho
 
 
 %description
@@ -50,50 +46,26 @@ This package contains the API documentation for %{name}.
 # remove org.apache.maven:apache-maven zip
 %pom_remove_dep org.apache.maven:apache-maven tycho-p2-extras-plugin
 
+%mvn_alias :{*} org.eclipse.tycho:@1
+
 %build
 # To run tests, we need :
 # maven-properties-plugin (unclear licensing)
-xmvn -o -Dmaven.test.skip=true install org.apache.maven.plugins:maven-javadoc-plugin:aggregate
+%mvn_build -f
 
 %install
-install -d -m 755 %{buildroot}%{_javadir}/%{name}
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-
-install -pm 644 pom.xml  %{buildroot}%{_mavenpomdir}/JPP.%{name}-main.pom
-%add_maven_depmap JPP.%{name}-main.pom -a "org.eclipse.tycho:tycho-extras,org.sonatype.tycho:tycho-extras"
-
-for mod in tycho-{custom-bundle,eclipserun,source-feature,version-bump}-plugin \
-           tycho-{buildtimestamp,sourceref}-jgit tycho-p2-extras-plugin \
-           pack200/tycho-pack200{{a,b}-plugin,-impl} \
-           target-platform-validation-plugin ; do
-   echo $mod
-   aid=`basename $mod`
-   install -pm 644 $mod/pom.xml  %{buildroot}%{_mavenpomdir}/JPP.%{name}-$aid.pom
-   install -m 644 $mod/target/$aid-%{version}%{snap}.jar %{buildroot}%{_javadir}/%{name}/$aid.jar
-   %add_maven_depmap JPP.%{name}-$aid.pom %{name}/$aid.jar -a "org.eclipse.tycho:$aid,org.sonatype.tycho:$aid"
-done
-
-for pommod in pack200; do
-   echo $pommod
-   aid=`basename $pommod`
-   install -pm 644 $pommod/pom.xml  %{buildroot}%{_mavenpomdir}/JPP.%{name}-$aid.pom
-   %add_maven_depmap JPP.%{name}-$aid.pom -a "org.eclipse.tycho:$aid,org.sonatype.tycho:$aid"
-done
-
-# javadoc
-install -dm 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
-
-
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/%{name}
-%{_javadir}/%{name}
-
-%files javadoc
-%{_javadocdir}/%{name}
+%mvn_install
+
+%files -f .mfiles
+%dir %{_javadir}/%{name}
+
+%files javadoc -f .mfiles-javadoc
 
 %changelog
+* Tue Mar 11 2014 Michael Simacek <msimacek@redhat.com> - 0.19.0-3
+- Use mvn_build and mvn_install.
+- Drop manual requires.
+
 * Thu Feb 27 2014 Roland Grunberg <rgrunber@redhat.com> - 0.19.0-2
 - Change R:java to R:java-headless (Bug 1068575).