diff --git a/plexus-interactivity.spec b/plexus-interactivity.spec
index 0cdaa99..4a6dd42 100644
--- a/plexus-interactivity.spec
+++ b/plexus-interactivity.spec
@@ -1,44 +1,11 @@
-# Copyright (c) 2000-2005, JPackage Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name of the JPackage Project nor the names of its
-#    contributors may be used to endorse or promote products derived
-#    from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-%global parent plexus
-%global subname interactivity
-
 Name:           plexus-interactivity
 Version:        1.0
-Release:        0.11.alpha6%{?dist}
+Release:        0.12.alpha6%{?dist}
 Epoch:          0
 Summary:        Plexus Interactivity Handler Component
 License:        MIT
-Group:          Development/Libraries
 URL:            http://plexus.codehaus.org/
+BuildArch:      noarch
 # svn export \
 #   http://svn.codehaus.org/plexus/plexus-components/tags/plexus-interactivity-1.0-alpha-6/
 # tar caf plexus-interactivity-1.0-alpha-6-src.tar.xz \
@@ -46,24 +13,11 @@ URL:            http://plexus.codehaus.org/
 Source0:        plexus-interactivity-1.0-alpha-6-src.tar.xz
 Patch1:         plexus-interactivity-dependencies.patch
 
-BuildArch:      noarch
-BuildRequires:  jpackage-utils >= 0:1.6
-BuildRequires:  ant >= 0:1.6
 BuildRequires:  maven-local
-BuildRequires:  maven-compiler-plugin
-BuildRequires:  maven-javadoc-plugin
-BuildRequires:  maven-site-plugin
-BuildRequires:  maven-surefire-maven-plugin
-BuildRequires:  maven-install-plugin
-BuildRequires:  maven-resources-plugin
-BuildRequires:  maven-jar-plugin
-BuildRequires:  jline
-BuildRequires:  plexus-utils
-BuildRequires:  plexus-component-api
-
-Requires:  plexus-component-api
-Requires:  plexus-utils
-Requires:  jline
+BuildRequires:  mvn(jline:jline)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-component-api)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-components)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
 
 %description
 The Plexus project seeks to create end-to-end developer tools for
@@ -74,65 +28,37 @@ velocity, etc. Plexus also includes an application server which
 is like a J2EE application server, without all the baggage.
 
 %package javadoc
-Summary:        Javadoc for %{name}
-Group:          Documentation
-Requires:       jpackage-utils
+Summary:        API documentation for %{name}
 
 %description javadoc
-API documentation for %{name}.
+This package provides %{summary}.
 
 %prep
 %setup -q -n plexus-interactivity-1.0-alpha-6
 %patch1 -p1
 
+%mvn_file ":{plexus}-{*}" @1/@2
+
 %build
-mvn-rpmbuild -e \
-        -Dmaven.test.skip=true \
-        install javadoc:aggregate
+%mvn_build -f
 
 %install
-# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
-install -pm 644 \
-  plexus-interactivity-api/target/%{name}-api-%{version}-alpha-6.jar \
-  $RPM_BUILD_ROOT%{_javadir}/plexus/interactivity-api.jar
-install -pm 644 \
-  plexus-interactivity-jline/target/%{name}-jline-%{version}-alpha-6.jar \
-  $RPM_BUILD_ROOT%{_javadir}/plexus/interactivity-jline.jar
-
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 \
-pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
-install -pm 644 \
-plexus-interactivity-api/pom.xml \
-        $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-interactivity-api.pom
-install -pm 644 \
-plexus-interactivity-jline/pom.xml \
-        $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-interactivity-jline.pom
-
-%add_maven_depmap JPP.%{parent}-%{subname}.pom
-%add_maven_depmap JPP.%{parent}-interactivity-api.pom  plexus/interactivity-api.jar
-%add_maven_depmap JPP.%{parent}-interactivity-jline.pom  plexus/interactivity-jline.jar
-
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%mvn_install
 
 %pre javadoc
 # workaround for rpm bug #447156 (can be removed in F-17)
 [ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
 rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
-%files
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%files -f .mfiles
 
-%files javadoc
-%doc %{_javadocdir}/*
+%files javadoc -f .mfiles-javadoc
 
 
 %changelog
+* Tue Oct 29 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.0-0.12.alpha6
+- Build with XMvn
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.0-0.11.alpha6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild