diff --git a/regexp.spec b/regexp.spec
index 7cf62eb..de9d8e7 100644
--- a/regexp.spec
+++ b/regexp.spec
@@ -1,7 +1,7 @@
 Name:           regexp
 Epoch:          1
 Version:        1.5
-Release:        22%{?dist}
+Release:        23%{?dist}
 Summary:        Simple regular expressions API
 License:        ASL 2.0
 URL:            http://jakarta.apache.org/%{name}/
@@ -37,20 +37,27 @@ cp -p %{SOURCE2} MANIFEST.MF
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 
+cat > pom.xml << EOF
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>jakarta-%{name}</groupId>
+  <artifactId>jakarta-%{name}</artifactId>
+  <version>%{version}</version>
+</project>
+EOF
+
+%mvn_file : %{name}
+
+%mvn_alias jakarta-%{name}:jakarta-%{name} %{name}:%{name}
+
 %build
 mkdir lib
 %ant -Djakarta-site2.dir=. jar javadocs
 
+%mvn_artifact pom.xml build/*.jar
+
 %install
-# jars
-install -d -m 755 %{buildroot}%{_javadir}
-install -m 644 build/*.jar %{buildroot}%{_javadir}/%{name}.jar
-
-# javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name}
-
-%add_maven_depmap jakarta-%{name}:jakarta-%{name}:%{version} -a %{name}:%{name} %{name}.jar
+%mvn_install -J docs/api
 
 %check
 %ant -Djakarta-site2.dir=. test
@@ -64,11 +71,13 @@ dummy = posix.readlink(dir) and os.remove(dir)
 %files -f .mfiles
 %doc LICENSE
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE
-%{_javadocdir}/%{name}
 
 %changelog
+* Thu Feb 25 2016 Michael Simacek <msimacek@redhat.com> - 1:1.5-23
+- Install with XMVn and add minimal pom
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.5-22
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild