diff --git a/xpp3.spec b/xpp3.spec
index 1a2b030..6540970 100644
--- a/xpp3.spec
+++ b/xpp3.spec
@@ -3,7 +3,7 @@
 Summary:        XML Pull Parser
 Name:           xpp3
 Version:        1.1.4
-Release:        12.c%{?dist}
+Release:        13.c%{?dist}
 License:        ASL 1.1
 URL:            http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html
 Source0:        http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz
@@ -19,7 +19,6 @@ BuildRequires:  ant
 BuildRequires:  junit
 BuildRequires:  xml-commons-apis
 Requires:       xml-commons-apis
-Requires:       java-headless
 
 BuildArch:      noarch
 
@@ -31,7 +30,6 @@ take best advantage of latest JIT JVMs such as Hotspot in JDK 1.4.
 
 %package minimal
 Summary:        Minimal XML Pull Parser
-Requires:       java-headless
 
 %description minimal
 Minimal XML pull parser implementation.
@@ -68,43 +66,29 @@ zip -u %{name}-%{oversion}.jar META-INF/MANIFEST.MF
 popd
 
 %install
-install -d -m 755 %{buildroot}%{_javadir}
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+%mvn_package :xpp3_min minimal
 
-# JARs
-install -p -m 644 build/%{name}-%{oversion}.jar \
-    %{buildroot}%{_javadir}/%{name}.jar
-install -p -m 644 build/%{name}_xpath-%{oversion}.jar \
-    %{buildroot}%{_javadir}/%{name}-xpath.jar
-install -p -m 644 build/%{name}_min-%{oversion}.jar \
-    %{buildroot}%{_javadir}/%{name}-minimal.jar
-
-# POMs
-install -p -m 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-install -p -m 644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/JPP-%{name}-xpath.pom
-install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}-minimal.pom
-
-# XMvn metadata
-%add_maven_depmap
-%add_maven_depmap JPP-%{name}-xpath.pom %{name}-xpath.jar
-%add_maven_depmap JPP-%{name}-minimal.pom %{name}-minimal.jar -f minimal
+%mvn_artifact %{SOURCE1} build/%{name}-%{oversion}.jar
+%mvn_artifact %{SOURCE2} build/%{name}_xpath-%{oversion}.jar
+%mvn_artifact %{SOURCE3} build/%{name}_min-%{oversion}.jar
 
 # Javadocs
-cp -pr doc/api/* %{buildroot}%{_javadocdir}/%{name}
+%mvn_install -J doc/api
 
 %files -f .mfiles
-%doc README.html doc/*
+%doc README.html doc/*.txt doc/*.html
 %license LICENSE.txt
 
 %files minimal -f .mfiles-minimal
 %license LICENSE.txt
 
-%files javadoc
-%doc %{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %license LICENSE.txt
 
 %changelog
+* Wed Mar 22 2017 Michael Simacek <msimacek@redhat.com> - 1.1.4-13.c
+- Install with XMvn
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-12.c
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild