diff --git a/jakarta-oro.spec b/jakarta-oro.spec
index 6150df2..4f58c8a 100644
--- a/jakarta-oro.spec
+++ b/jakarta-oro.spec
@@ -32,20 +32,20 @@
 
 Name:           jakarta-oro
 Version:        2.0.8
-Release:        20%{?dist}
+Release:        21%{?dist}
 Epoch:          0
 Summary:        Full regular expressions API
 License:        ASL 1.1
-Group:          Development/Libraries
 Source0:        http://archive.apache.org/dist/jakarta/oro/%{name}-%{version}.tar.gz
 Source1:        MANIFEST.MF
 Source2:        http://repo1.maven.org/maven2/%{base_name}/%{base_name}/%{version}/%{base_name}-%{version}.pom
 Patch1:         %{name}-build-xml.patch
 URL:            http://jakarta.apache.org/oro
+
 BuildRequires:  javapackages-local
 BuildRequires:  ant
+
 BuildArch:      noarch
-Requires:       jpackage-utils
 
 %description
 The Jakarta-ORO Java classes are a set of text-processing Java classes
@@ -56,9 +56,7 @@ successor to the OROMatcher, AwkTools, PerlTools, and TextTools
 libraries from ORO, Inc. (www.oroinc.com). 
 
 %package javadoc
-Group:          Documentation
 Summary:        Javadoc for %{name}
-Requires:       jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
@@ -78,30 +76,22 @@ cp %{SOURCE1} .
 ant -Dfinal.name=%{base_name} jar javadocs
 
 %install
-#jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 %{base_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && ln -sf %{name}.jar %{base_name}.jar)
-#javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-rm -rf docs/api
+%mvn_file : %{name} %{base_name}
+%mvn_artifact %{SOURCE2} %{base_name}.jar
 
-# POM and depmap
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
+%mvn_install -J docs/api
 
 %files -f .mfiles
-%doc COMPILE ISSUES README TODO CHANGES CONTRIBUTORS LICENSE STYLE
-# symlink, not in .mfiles
-%{_javadir}/%{base_name}.jar
+%doc COMPILE ISSUES README TODO CHANGES CONTRIBUTORS STYLE
+%license LICENSE
 
-%files javadoc
-%doc LICENSE
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
+%license LICENSE
 
 %changelog
+* Wed Mar 22 2017 Michael Simacek <msimacek@redhat.com> - 0:2.0.8-21
+- Install with XMvn
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0.8-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild