diff --git a/jdom.spec b/jdom.spec
index 1617795..1bdff60 100644
--- a/jdom.spec
+++ b/jdom.spec
@@ -30,26 +30,21 @@
 
 Name:           jdom
 Version:        1.1.3
-Release:        11%{?dist}
+Release:        12%{?dist}
 Epoch:          0
 Summary:        Java alternative to DOM and SAX
 License:        ASL 1.1
 URL:            http://www.jdom.org/
-Group:          Development/Libraries
 Source0:        http://jdom.org/dist/binary/archive/jdom-%{version}.tar.gz
 Source1:        http://repo1.maven.org/maven2/org/jdom/jdom/%{version}/jdom-%{version}.pom
 Patch0:         %{name}-crosslink.patch
 Patch1:         %{name}-1.1-OSGiManifest.patch
 
-BuildRequires:  ant >= 0:1.6
-BuildRequires:  java-javadoc
-BuildRequires:  jaxen
+BuildRequires:  ant
 BuildRequires:  javapackages-local
-BuildRequires:  xalan-j2 >= 0:2.2.0
 
-Requires:       jaxen
-Requires:       jpackage-utils
-Requires:       xalan-j2 >= 0:2.2.0
+BuildRequires:  mvn(jaxen:jaxen)
+BuildRequires:  mvn(xerces:xercesImpl)
 
 BuildArch:      noarch
 
@@ -63,15 +58,12 @@ and SAX.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Documentation
-Requires:       jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
 
 %package demo
 Summary:        Demos for %{name}
-Group:          Development/Libraries
 Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description demo
@@ -87,39 +79,34 @@ find . -name "*.jar" -exec rm -f {} \;
 find . -name "*.class" -exec rm -f {} \;
 
 %build
-export CLASSPATH=$(build-classpath xalan-j2 jaxen)
+export CLASSPATH=$(build-classpath xerces-j2 jaxen)
 ant -Dj2se.apidoc=%{_javadocdir}/java package javadoc-link
 
 %install
-# jars
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p build/%{name}-1.1.2-snap.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-# javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr build/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%mvn_file : %{name}
+%mvn_alias : jdom:jdom
+%mvn_artifact %{SOURCE1} build/%{name}-*.jar
+%mvn_install -J build/apidocs
 
 # demo
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-# maven stuff
-mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
-cp %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-jdom.pom
-%add_maven_depmap JPP-jdom.pom %{name}.jar -a "jdom:jdom"
-
 %files -f .mfiles
-%doc CHANGES.txt COMMITTERS.txt LICENSE.txt README.txt TODO.txt
+%license LICENSE.txt
+%doc CHANGES.txt COMMITTERS.txt README.txt TODO.txt
 
-%files javadoc
-%{_javadocdir}/%{name}
-%doc LICENSE.txt
+%files javadoc -f .mfiles-javadoc
+%license LICENSE.txt
 
 %files demo
 %{_datadir}/%{name}
-%doc LICENSE.txt
+%license LICENSE.txt
 
 %changelog
+* Wed Mar 22 2017 Michael Simacek <msimacek@redhat.com> - 0:1.1.3-12
+- Install with XMvn
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.1.3-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild