diff --git a/xz-java.spec b/xz-java.spec
index 8fbe8bd..16227a6 100644
--- a/xz-java.spec
+++ b/xz-java.spec
@@ -1,6 +1,6 @@
 Name:           xz-java
 Version:        1.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Java implementation of XZ data compression
 License:        Public Domain
 URL:            http://tukaani.org/xz/java.html
@@ -8,13 +8,9 @@ BuildArch:      noarch
 
 Source0:        http://tukaani.org/xz/xz-java-%{version}.zip
 
-BuildRequires:  jpackage-utils
-BuildRequires:  java-devel
+BuildRequires:  javapackages-local
 BuildRequires:  ant
 
-Requires:       jpackage-utils
-Requires:       java-headless
-
 %description
 A complete implementation of XZ data compression in Java.
 
@@ -32,6 +28,8 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -c %{name}-%{version}
 
+%mvn_file : %{name} xz
+
 %build
 # During documentation generation the upstream build.xml tries to download
 # package-list from oracle.com. Create a dummy package-list to prevent that.
@@ -40,27 +38,20 @@ mkdir -p extdoc && touch extdoc/package-list
 ant maven
 
 %install
-# jar
-install -dm 755 %{buildroot}%{_javadir}
-install -m 644 build/jar/xz.jar %{buildroot}%{_javadir}/%{name}.jar
-ln -sf %{name}.jar %{buildroot}%{_javadir}/xz.jar
-# javadoc
-install -dm 755 %{buildroot}%{_javadocdir}
-cp -R build/doc %{buildroot}%{_javadocdir}/%{name}
-# pom
-install -dm 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 build/maven/xz-%{version}.pom %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
+%mvn_artifact build/maven/xz-%{version}.pom build/jar/xz.jar
+
+%mvn_install -J build/doc
 
 %files -f .mfiles
 %doc COPYING README THANKS
-%{_javadir}/xz.jar
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc COPYING
-%{_javadocdir}/%{name}
 
 %changelog
+* Tue Mar 21 2017 Michael Simacek <msimacek@redhat.com> - 1.6-3
+- Install with XMvn
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild