diff --git a/java-service-wrapper.spec b/java-service-wrapper.spec
index 7a4ea06..f3cea34 100644
--- a/java-service-wrapper.spec
+++ b/java-service-wrapper.spec
@@ -21,7 +21,7 @@
 
 Name:           java-service-wrapper
 Version:        3.2.5
-Release:        26%{?dist}
+Release:        27%{?dist}
 Summary:        Java service wrapper
 License:        MIT
 URL:            https://bitbucket.org/ivertex/yaja-wrapper
@@ -43,11 +43,9 @@ Patch2:         %{name}-3.2.4-docbuild.patch
 Patch3:         %{name}-3.2.5-rhbz1037144.patch
 Patch99:	ppc64le-support.patch
 BuildRequires:  ant
-BuildRequires:  java-devel
-BuildRequires:  jpackage-utils
+BuildRequires:  javapackages-local
 BuildRequires:  gcc
 BuildRequires:  make
-Requires:       java-headless
 
 %description
 The Java Service Wrapper enables a Java application to be run as a
@@ -92,18 +90,13 @@ rm -r doc/english
 %install
 install -Dpm 755 bin/wrapper $RPM_BUILD_ROOT%{_sbindir}/java-service-wrapper
 
-install -dm 755 $RPM_BUILD_ROOT%{_jnidir}
 install -dm 755 $RPM_BUILD_ROOT%{_libdir}/%{name}
 install -pm 755 lib/libwrapper.so $RPM_BUILD_ROOT%{_libdir}/%{name}
-install -pm 644 lib/wrapper.jar $RPM_BUILD_ROOT%{_jnidir}/%{name}.jar
-ln -sf %{_jnidir}/%{name}.jar $RPM_BUILD_ROOT%{_libdir}/%{name}/wrapper.jar
-    
-install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
 
-install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}
-cp -pR javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%mvn_file : %{name} %{_libdir}/%{name}/wrapper
+%mvn_artifact pom.xml lib/wrapper.jar
+
+%mvn_install -J javadoc
 
 %files -f .mfiles
 %doc AboutThisRepository.txt doc/
@@ -111,11 +104,13 @@ cp -pR javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{_libdir}/%{name}/
 %license doc/license.txt
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %license doc/license.txt
 
 %changelog
+* Mon Jul 03 2017 Michael Simacek <msimacek@redhat.com> - 3.2.5-27
+- Install with XMvn
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.5-26
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild