diff --git a/tomcat.changes b/tomcat.changes
index b34e14c..1ee80ad 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Mar 24 08:06:33 UTC 2015 - tchvatal@suse.com
+
+- Fix previous commit. Fix one rpmlint warning
+
+-------------------------------------------------------------------
+Wed Mar 18 10:22:27 UTC 2015 - tchvatal@suse.com
+
+- Drop gpg verification from spec, it is done by obs
+
+-------------------------------------------------------------------
+Wed Mar 18 10:16:07 UTC 2015 - tchvatal@suse.com
+
+- Fix build with new jpackage-tools
+
 -------------------------------------------------------------------
 Wed Sep 17 11:28:46 UTC 2014 - bmaryniuk@suse.com
 
diff --git a/tomcat.spec b/tomcat.spec
index 135d713..2ab848c 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package tomcat
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2000-2009, JPackage Project
 #
 # All modifications and additions to the file contributed by third parties
@@ -111,9 +111,6 @@ Requires(preun): /sbin/chkconfig
 Recommends:     libtcnative-1-0 >= 1.1.24
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
-%if 0%{?suse_version} > 1220
-BuildRequires:  gpg-offline
-%endif
 %if %{with_systemd}
 BuildRequires:  systemd
 %systemd_requires
@@ -145,7 +142,7 @@ Summary:        Libraries for Embedding Apache Tomcat
 Group:          Productivity/Networking/Web/Servers
 
 %description embed
-Embedded support for Tomcat
+Embedded support (various Libraries) for Apache Tomcat
 
 %package docs-webapp
 Summary:        The docs web application for Apache Tomcat
@@ -239,10 +236,6 @@ Requires:       jakarta-taglibs-standard >= 1.1
 The ROOT and examples web applications for Apache Tomcat
 
 %prep
-%if 0%{?suse_version} > 1220
-%gpg_verify %{S:1001}
-%endif
-
 %setup -q -n %{packdname}
 # remove pre-built binaries and windows files
 find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \
@@ -736,7 +729,7 @@ rm -f \
 %{_javadir}/%{name}-el-api.jar
 %{libdir}/%{name}-el-%{elspec}-api.jar
 %{_mavenpomdir}/JPP-%{name}-el-api.pom
-%{_mavendepmapfragdir}/%{name}-tomcat-el-api
+%{_datadir}/maven-metadata/%{name}-tomcat-el-api.xml
 %{_javadir}/el_1_0_api.jar
 %{_javadir}/el_api.jar
 %ghost %{_sysconfdir}/alternatives/el_1_0_api.jar
@@ -753,14 +746,14 @@ rm -f \
 %{_javadir}/jsp.jar
 %ghost %{_sysconfdir}/alternatives/jsp.jar
 %{_mavenpomdir}/JPP-%{name}-jsp-api.pom
-%{_mavendepmapfragdir}/%{name}-tomcat-jsp-api
+%{_datadir}/maven-metadata/%{name}-tomcat-jsp-api.xml
 
 %files lib
 %defattr(-,root,root)
 %{libdir}
 %dir %{bindir}
 %{bindir}/tomcat-juli.jar
-%{_mavendepmapfragdir}/%{name}
+%{_datadir}/maven-metadata/%{name}.xml
 %{_mavenpomdir}/JPP.%{name}-annotations-api.pom
 %{_mavenpomdir}/JPP.%{name}-catalina-ha.pom
 %{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom
@@ -796,7 +789,7 @@ rm -f \
 %{_javadir}/%{name}-servlet-api.jar
 %{_javadir}/servlet.jar
 %ghost %{_sysconfdir}/alternatives/servlet.jar
-%{_mavendepmapfragdir}/%{name}-tomcat-servlet-api
+%{_datadir}/maven-metadata/%{name}-tomcat-servlet-api.xml
 %{_mavenpomdir}/JPP-%{name}-servlet-api.pom
 
 %files webapps