diff --git a/java_cup-pom.xml b/java_cup-pom.xml
deleted file mode 100644
index c196b8f..0000000
--- a/java_cup-pom.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>java_cup</groupId>
-  <artifactId>java_cup</artifactId>
-  <packaging>jar</packaging>
-  <name>Java CUP</name>
-  <version>0.11b</version>
-</project>
diff --git a/java_cup.spec b/java_cup.spec
index c248dee..e6f60f3 100644
--- a/java_cup.spec
+++ b/java_cup.spec
@@ -3,7 +3,7 @@
 
 Name:           java_cup
 Version:        0.11b
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          1
 Summary:        LALR parser generator for Java
 License:        MIT
@@ -13,7 +13,6 @@ BuildArch:      noarch
 # svn export -r 65 https://www2.in.tum.de/repos/cup/develop/ java_cup-0.11b
 # tar cjf java_cup-0.11b.tar.bz2 java_cup-0.11b/
 Source0:        java_cup-%{version}.tar.bz2
-Source1:        java_cup-pom.xml
 # Add OSGi manifests
 Source2:        %{name}-MANIFEST.MF
 Source4:        %{name}-runtime-MANIFEST.MF
@@ -21,16 +20,13 @@ Source4:        %{name}-runtime-MANIFEST.MF
 Patch0:         %{name}-build.patch
 
 BuildRequires:  ant
-BuildRequires:  java-devel
-BuildRequires:  jpackage-utils >= 0:1.5
+BuildRequires:  javapackages-local
 BuildRequires:  jflex
 %if ! %{with_bootstrap}
 BuildRequires:  java_cup >= 1:0.11a
 %endif
 BuildRequires:  zip
 
-Requires:       java-headless
-
 
 %description
 java_cup is a LALR Parser Generator for Java
@@ -48,9 +44,8 @@ Summary:        Documentation for java_cup
 Documentation for java_cup.
 
 %prep
-%setup -q 
+%setup -q
 %patch0 -b .build
-cp %{SOURCE1} pom.xml
 
 # remove all binary files
 find -name "*.class" -delete
@@ -82,34 +77,27 @@ cp -p %{SOURCE4} META-INF/MANIFEST.MF
 touch META-INF/MANIFEST.MF
 zip -u dist/java-cup-%{pkg_version}-runtime.jar META-INF/MANIFEST.MF
 
-# jar
-install -d -m 755 %{buildroot}%{_javadir}
-install -m 644 dist/java-cup-%{pkg_version}.jar %{buildroot}%{_javadir}/%{name}.jar
-install -m 644 dist/java-cup-%{pkg_version}-runtime.jar %{buildroot}%{_javadir}/%{name}-runtime.jar
-
-# poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
+%mvn_file ':{*}' @1
+%mvn_artifact %{name}:%{name}:%{version} dist/java-cup-%{pkg_version}.jar
+%mvn_artifact %{name}:%{name}-runtime:%{version} dist/java-cup-%{pkg_version}-runtime.jar
 
-# javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name}
+%mvn_install -J dist/javadoc
 
 %files -f .mfiles
 %doc changelog.txt
-%{_javadir}/*
 %license licence.txt
 
 %files manual
 %doc manual.html
 %license licence.txt
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %license licence.txt
-%{_javadocdir}/%{name}
 
 %changelog
+* Wed Mar 22 2017 Michael Simacek <msimacek@redhat.com> - 1:0.11b-5
+- Install with XMvn
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11b-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild