diff --git a/el-api-OSGi-MANIFEST.MF b/el-api-OSGi-MANIFEST.MF
index f1f98bf..5882901 100644
--- a/el-api-OSGi-MANIFEST.MF
+++ b/el-api-OSGi-MANIFEST.MF
@@ -1,4 +1,3 @@
-Manifest-Version: 1.0
 Export-Package: javax.el;version="2.2.0"
 Bundle-Vendor: %bundleProvider
 Bundle-ClassPath: .
diff --git a/jasper-OSGi-MANIFEST.MF b/jasper-OSGi-MANIFEST.MF
index b28cd51..7ad9a5c 100644
--- a/jasper-OSGi-MANIFEST.MF
+++ b/jasper-OSGi-MANIFEST.MF
@@ -1,4 +1,3 @@
-Manifest-Version: 1.0
 Export-Package: org.apache.jasper;version="7.0.21",org.apache.jasper.c
  ompiler;version="7.0.21",org.apache.jasper.compiler.tagplugin;version
  ="7.0.21",org.apache.jasper.resources;version="7.0.21",org.apache.jas
diff --git a/jasper-el-OSGi-MANIFEST.MF b/jasper-el-OSGi-MANIFEST.MF
index 158f023..bad19b2 100644
--- a/jasper-el-OSGi-MANIFEST.MF
+++ b/jasper-el-OSGi-MANIFEST.MF
@@ -1,4 +1,3 @@
-Manifest-Version: 1.0
 Export-Package: org.apache.el;version="7.0.21"
 Bundle-Vendor: %bundleProvider
 Bundle-ClassPath: .
diff --git a/jsp-api-OSGi-MANIFEST.MF b/jsp-api-OSGi-MANIFEST.MF
index 35aca76..97288d3 100644
--- a/jsp-api-OSGi-MANIFEST.MF
+++ b/jsp-api-OSGi-MANIFEST.MF
@@ -1,4 +1,3 @@
-Manifest-Version: 1.0
 Bundle-Vendor: %bundleProvider
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
diff --git a/servlet-api-OSGi-MANIFEST.MF b/servlet-api-OSGi-MANIFEST.MF
index 1a5c6ed..5838552 100644
--- a/servlet-api-OSGi-MANIFEST.MF
+++ b/servlet-api-OSGi-MANIFEST.MF
@@ -1,4 +1,3 @@
-Manifest-Version: 1.0
 Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,J2SE-1.4
 Bundle-SymbolicName: javax.servlet
 Bundle-ManifestVersion: 2
diff --git a/tomcat-api-OSGi-MANIFEST.MF b/tomcat-api-OSGi-MANIFEST.MF
index 7c1a408..0ad82a6 100644
--- a/tomcat-api-OSGi-MANIFEST.MF
+++ b/tomcat-api-OSGi-MANIFEST.MF
@@ -1,4 +1,3 @@
-Manifest-Version: 1.0
 Export-Package: org.apache.tomcat;version="7.0.21"
 Bundle-Vendor: %bundleProvider
 Bundle-ClassPath: .
diff --git a/tomcat-juli-OSGi-MANIFEST.MF b/tomcat-juli-OSGi-MANIFEST.MF
index fcd349b..75ff5d2 100644
--- a/tomcat-juli-OSGi-MANIFEST.MF
+++ b/tomcat-juli-OSGi-MANIFEST.MF
@@ -1,4 +1,3 @@
-Manifest-Version: 1.0
 Export-Package: org.apache.juli;version="7.0.21",org.apache.juli.loggi
  ng;version="7.0.21"
 Bundle-Vendor: %bundleProvider
diff --git a/tomcat.changes b/tomcat.changes
index 39c17d7..6867a0b 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Jan 26 08:07:36 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Clean up OSGi manifest injection
+- Put embed maven metadata into embed subpackage
+- Use the .mfiles* lists generated by %%add_maven_depmap macro
+
 -------------------------------------------------------------------
 Wed Jan 16 17:05:36 UTC 2019 - malbu@suse.com
 
diff --git a/tomcat.spec b/tomcat.spec
index 875d71e..93b70be 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -184,6 +184,7 @@ Javadoc generated documentation files for Apache Tomcat.
 %package jsp-2_3-api
 Summary:        Apache Tomcat JSP API implementation classes
 Group:          Productivity/Networking/Web/Servers
+Requires:       %{name}-el-%{elspec}-api = %{version}-%{release}
 Requires:       %{name}-servlet-%{servletspec}-api = %{version}-%{release}
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
@@ -192,8 +193,6 @@ Provides:       jsp = %{jspspec}
 Provides:       jsp23
 Obsoletes:      jsp < %{jspspec}
 Obsoletes:      tomcat-jsp-2_2-api
-Requires:       mvn(org.apache.tomcat:tomcat-el-api)
-Requires:       mvn(org.apache.tomcat:tomcat-servlet-api)
 
 %description jsp-2_3-api
 Apache Tomcat JSP API implementation classes version 2.3
@@ -313,28 +312,13 @@ popd
 popd
 
 # inject OSGi manifests
-mkdir -p META-INF
-cp -p %{SOURCE8} META-INF/MANIFEST.MF
-touch META-INF/MANIFEST.MF
-zip -u output/build/lib/servlet-api.jar META-INF/MANIFEST.MF
-cp -p %{SOURCE9} META-INF/MANIFEST.MF
-touch META-INF/MANIFEST.MF
-zip -u output/build/lib/jsp-api.jar META-INF/MANIFEST.MF
-cp -p %{SOURCE12} META-INF/MANIFEST.MF
-touch META-INF/MANIFEST.MF
-zip -u output/build/lib/el-api.jar META-INF/MANIFEST.MF
-cp -p %{SOURCE13} META-INF/MANIFEST.MF
-touch META-INF/MANIFEST.MF
-zip -u output/build/lib/jasper-el.jar META-INF/MANIFEST.MF
-cp -p %{SOURCE14} META-INF/MANIFEST.MF
-touch META-INF/MANIFEST.MF
-zip -u output/build/lib/jasper.jar META-INF/MANIFEST.MF
-cp -p %{SOURCE15} META-INF/MANIFEST.MF
-touch META-INF/MANIFEST.MF
-zip -u output/build/lib/tomcat-api.jar META-INF/MANIFEST.MF
-cp -p %{SOURCE16} META-INF/MANIFEST.MF
-touch META-INF/MANIFEST.MF
-zip -u output/build/bin/tomcat-juli.jar META-INF/MANIFEST.MF
+jar ufm output/build/lib/servlet-api.jar %{SOURCE8}
+jar ufm output/build/lib/jsp-api.jar %{SOURCE9}
+jar ufm output/build/lib/el-api.jar %{SOURCE12}
+jar ufm output/build/lib/jasper-el.jar %{SOURCE13}
+jar ufm output/build/lib/jasper.jar %{SOURCE14}
+jar ufm output/build/lib/tomcat-api.jar %{SOURCE15}
+jar ufm output/build/bin/tomcat-juli.jar %{SOURCE16}
 
 %install
 %if 0%{?suse_version} == 1110
@@ -508,16 +492,16 @@ done
 
 # servlet-api jsp-api and el-api are not in tomcat subdir, since they are widely re-used elsewhere
 cp -a tomcat-jsp-api.pom %{buildroot}%{_mavenpomdir}/JPP-tomcat-jsp-api.pom
-%add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -f "tomcat-jsp-api" -a "javax.servlet.jsp:javax.servlet.jsp-api,javax.servlet:jsp-api,org.eclipse.jetty.orbit:javax.servlet.jsp"
+%add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -f jsp-api -a "javax.servlet.jsp:javax.servlet.jsp-api,javax.servlet:jsp-api,org.eclipse.jetty.orbit:javax.servlet.jsp"
 
 cp -a tomcat-el-api.pom %{buildroot}%{_mavenpomdir}/JPP-tomcat-el-api.pom
-%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f "tomcat-el-api" -a "javax.el:javax.el-api,javax.el:el-api,org.eclipse.jetty.orbit:javax.el"
+%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f el-api -a "javax.el:javax.el-api,javax.el:el-api,org.eclipse.jetty.orbit:javax.el"
 
 cp -a tomcat-servlet-api.pom %{buildroot}%{_mavenpomdir}/JPP-tomcat-servlet-api.pom
 # Generate a depmap fragment javax.servlet:servlet-api pointing to
 # tomcat-servlet-3.0-api for backwards compatibility
 # also provide jetty depmap (originally in jetty package, but it's cleaner to have it here
-%add_maven_depmap JPP-tomcat-servlet-api.pom tomcat-servlet-api.jar -f "tomcat-servlet-api" -a "javax.servlet:servlet-api,javax.servlet:javax.servlet-api,org.mortbay.jetty:servlet-api"
+%add_maven_depmap JPP-tomcat-servlet-api.pom tomcat-servlet-api.jar -f servlet-api -a "javax.servlet:servlet-api,javax.servlet:javax.servlet-api,org.mortbay.jetty:servlet-api"
 
 # two special pom where jar files have different names
 cp -a tomcat-tribes.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom
@@ -548,18 +532,18 @@ cp -a tomcat-websocket.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-websoc
 %add_maven_depmap JPP.%{name}-tomcat-websocket.pom %{name}/tomcat-websocket.jar
 
 cp -a tomcat-embed-core.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-core.pom
-%add_maven_depmap JPP.%{name}-tomcat-embed-core.pom %{name}/tomcat-embed-core.jar
+%add_maven_depmap JPP.%{name}-tomcat-embed-core.pom %{name}/tomcat-embed-core.jar -f embed
 
 cp -a tomcat-embed-el.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-el.pom
-%add_maven_depmap JPP.%{name}-tomcat-embed-el.pom %{name}/tomcat-embed-el.jar
+%add_maven_depmap JPP.%{name}-tomcat-embed-el.pom %{name}/tomcat-embed-el.jar -f embed
 
 cp -a tomcat-embed-jasper.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-jasper.pom
-%add_maven_depmap JPP.%{name}-tomcat-embed-jasper.pom %{name}/tomcat-embed-jasper.jar
+%add_maven_depmap JPP.%{name}-tomcat-embed-jasper.pom %{name}/tomcat-embed-jasper.jar -f embed
 
 %add_maven_depmap JPP.%{name}-websocket-api.pom %{name}/websocket-api.jar
 
 cp -a tomcat-embed-websocket.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-websocket.pom
-%add_maven_depmap JPP.%{name}-tomcat-embed-websocket.pom %{name}/tomcat-embed-websocket.jar
+%add_maven_depmap JPP.%{name}-tomcat-embed-websocket.pom %{name}/tomcat-embed-websocket.jar -f embed
 
 # replace temporary copy with link
 ln -s -f %{bindir}/tomcat-juli.jar %{buildroot}%{libdir}/
@@ -717,16 +701,10 @@ rm -f \
 %files docs-webapp
 %doc %{appdir}/docs
 
-%files el-3_0-api
+%files el-3_0-api -f output/dist/src/res/maven/.mfiles-el-api
 %{_javadir}/%{name}-el-%{elspec}-api.jar
 %{_javadir}/%{name}-el-api.jar
 %{libdir}/%{name}-el-%{elspec}-api.jar
-%{_mavenpomdir}/JPP-%{name}-el-api.pom
-%if %{defined _maven_repository}
-%{_mavendepmapfragdir}/%{name}-tomcat-el-api
-%else
-%{_datadir}/maven-metadata/%{name}-tomcat-el-api.xml
-%endif
 %{_javadir}/%{name}-el_1_0_api.jar
 %{_javadir}/%{name}-el_api.jar
 %ghost %{_sysconfdir}/alternatives/el_1_0_api
@@ -735,67 +713,31 @@ rm -f \
 %files javadoc
 %doc %{_javadocdir}/%{name}
 
-%files jsp-2_3-api
+%files jsp-2_3-api -f output/dist/src/res/maven/.mfiles-jsp-api
 %{_javadir}/%{name}-jsp-%{jspspec}-api.jar
 %{_javadir}/%{name}-jsp-api.jar
 %{_javadir}/%{name}-jsp.jar
 %ghost %{_sysconfdir}/alternatives/jsp
-%{_mavenpomdir}/JPP-%{name}-jsp-api.pom
-%if %{defined _maven_repository}
-%{_mavendepmapfragdir}/%{name}-tomcat-jsp-api
-%else
-%{_datadir}/maven-metadata/%{name}-tomcat-jsp-api.xml
-%endif
 
-%files lib
+%files lib -f output/dist/src/res/maven/.mfiles
 %{libdir}
 %dir %{bindir}
 %{bindir}/tomcat-juli.jar
-%if %{defined _maven_repository}
-%{_mavendepmapfragdir}/%{name}
-%else
-%{_datadir}/maven-metadata/%{name}.xml
-%endif
-%{_mavenpomdir}/JPP.%{name}-annotations-api.pom
-%{_mavenpomdir}/JPP.%{name}-catalina-ha.pom
-%{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom
-%{_mavenpomdir}/JPP.%{name}-catalina.pom
-%{_mavenpomdir}/JPP.%{name}-jasper-el.pom
-%{_mavenpomdir}/JPP.%{name}-jasper.pom
-%{_mavenpomdir}/JPP.%{name}-tomcat-api.pom
-%{_mavenpomdir}/JPP.%{name}-tomcat-dbcp.pom
-%{_mavenpomdir}/JPP.%{name}-tomcat-jdbc.pom
-%{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom
-%{_mavenpomdir}/JPP.%{name}-tomcat-coyote.pom
-%{_mavenpomdir}/JPP.%{name}-tomcat-util.pom
-%{_mavenpomdir}/JPP.%{name}-tomcat-websocket.pom
-%{_mavenpomdir}/JPP.%{name}-websocket-api.pom
 %exclude %{libdir}/%{name}-el-%{elspec}-api.jar
 %exclude %{libdir}/%{name}*-embed-*.jar
 # bnc#418664
 %dir %{_sysconfdir}/ant.d
 %config(noreplace) %{_sysconfdir}/ant.d/catalina-ant
 
-%files embed
+%files embed -f output/dist/src/res/maven/.mfiles-embed
 %dir %{libdir}
-%{libdir}/%{name}*-embed-*.jar
-%{_mavenpomdir}/JPP.%{name}-tomcat-embed-websocket.pom
-%{_mavenpomdir}/JPP.%{name}-tomcat-embed-core.pom
-%{_mavenpomdir}/JPP.%{name}-tomcat-embed-el.pom
-%{_mavenpomdir}/JPP.%{name}-tomcat-embed-jasper.pom
 
-%files servlet-4_0-api
+%files servlet-4_0-api -f output/dist/src/res/maven/.mfiles-servlet-api
 %license LICENSE
 %{_javadir}/%{name}-servlet-%{servletspec}-api.jar
 %{_javadir}/%{name}-servlet-api.jar
 %{_javadir}/%{name}-servlet.jar
 %ghost %{_sysconfdir}/alternatives/servlet
-%if %{defined _maven_repository}
-%{_mavendepmapfragdir}/%{name}-tomcat-servlet-api
-%else
-%{_datadir}/maven-metadata/%{name}-tomcat-servlet-api.xml
-%endif
-%{_mavenpomdir}/JPP-%{name}-servlet-api.pom
 
 %files webapps
 #bnc#520532