diff --git a/bea-stax.spec b/bea-stax.spec
index 324d588..ca1cfe0 100644
--- a/bea-stax.spec
+++ b/bea-stax.spec
@@ -28,26 +28,23 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%global mainver 1.2.0
 %global apiver  1.0.1
 
 Summary:        Streaming API for XML
 URL:            http://stax.codehaus.org/Home
-Source0:        http://dist.codehaus.org/stax/distributions/stax-src-1.2.0.zip
-Source1:        http://dist.codehaus.org/stax/jars/stax-1.2.0.pom
-Source2:        http://dist.codehaus.org/stax/jars/stax-api-1.0.1.pom
+Source0:        http://dist.codehaus.org/stax/distributions/stax-src-%{version}.zip
+Source1:        http://dist.codehaus.org/stax/jars/stax-%{version}.pom
+Source2:        http://dist.codehaus.org/stax/jars/stax-api-%{apiver}.pom
 Name:           bea-stax
-Version:        %{mainver}
-Release:        13%{?dist}
+Version:        1.2.0
+Release:        14%{?dist}
 License:        ASL 1.1 and ASL 2.0
-Group:          Development/Libraries/Java
 BuildArch:      noarch
 
-BuildRequires:          jpackage-utils
-BuildRequires:          ant
-BuildRequires:          xerces-j2,xalan-j2
-BuildRequires:          java-devel
-Requires:               jpackage-utils
+BuildRequires:  javapackages-local
+BuildRequires:  ant
+BuildRequires:  xerces-j2
+BuildRequires:  xalan-j2
 
 %description
 The Streaming API for XML (StAX) is a groundbreaking
@@ -56,16 +53,12 @@ efficiently.
 
 %package api
 Summary:        The StAX API
-Group:          Development/Documentation
-Requires:       jpackage-utils
 
 %description api
 %{summary}
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
-Requires:       jpackage-utils
 
 %description javadoc
 %{summary}
@@ -76,40 +69,36 @@ Requires:       jpackage-utils
 # Convert CR+LF to LF
 %{__sed} -i 's/\r//' ASF2.0.txt
 
+cp -p %{SOURCE1} pom.xml
+
+# Incorrectly scoped
+%pom_remove_dep :junit
+
 %build
-export CLASSPATH=`pwd`/build/stax-api-%{apiver}.jar
 ant all javadoc
 
 %install
-# jar
-install -Dpm 0644 build/stax-api-%{apiver}.jar %{buildroot}%{_javadir}/%{name}-api.jar
-install -Dpm 0644 build/stax-%{version}-dev.jar %{buildroot}%{_javadir}/%{name}.jar
-# the following symlink can be removed once no package needs "bea-stax-ri"
-ln -s %{name}.jar %{buildroot}%{_javadir}/%{name}-ri.jar
-
-# javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr build/javadoc/* %{buildroot}%{_javadocdir}/%{name}
+%mvn_file ':{*}' bea-@1
+%mvn_package :stax-api api
+%mvn_alias :stax-api javax.xml.stream:stax-api
+%mvn_artifact pom.xml build/stax-%{version}-dev.jar
+%mvn_artifact %{SOURCE2} build/stax-api-%{apiver}.jar
 
-# pom
-install -Dpm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-install -Dpm 644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/JPP-%{name}-api.pom
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-%add_maven_depmap -f api -a "javax.xml.stream:stax-api" JPP-%{name}-api.pom %{name}-api.jar
+%mvn_install -J build/javadoc
 
 %files -f .mfiles
-%doc ASF2.0.txt
-%{_javadir}/%{name}-ri.jar
+%license ASF2.0.txt
 
 %files api -f .mfiles-api
-%doc ASF2.0.txt
+%license ASF2.0.txt
 
-%files javadoc
-%doc ASF2.0.txt
-%doc %{_javadocdir}/*
+%files javadoc -f .mfiles-javadoc
+%license ASF2.0.txt
 
 %changelog
+* Wed Mar 22 2017 Michael Simacek <msimacek@redhat.com> - 1.2.0-14
+- Install with XMvn
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild