diff --git a/xmlgraphics-commons-build_xml.patch b/xmlgraphics-commons-build_xml.patch
index a1c473e..97ed17a 100644
--- a/xmlgraphics-commons-build_xml.patch
+++ b/xmlgraphics-commons-build_xml.patch
@@ -1,15 +1,25 @@
 --- build.xml	2018-05-14 11:00:43.000000000 +0200
-+++ build.xml	2019-01-19 08:32:11.492539275 +0100
-@@ -252,6 +252,8 @@
++++ build.xml	2020-04-03 14:37:25.091265000 +0200
+@@ -251,7 +251,17 @@
+         <attribute name="Implementation-Title" value="${Name}"/>
          <attribute name="Implementation-Version" value="${version}"/>
          <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/)"/>
-         <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}])"/>
+-        <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}])"/>
++        <attribute name="Bundle-Description" value="${Name}"/>
++        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
++        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
++        <attribute name="Bundle-ManifestVersion" value="2"/>
++        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:${name}"/>
 +        <attribute name="Bundle-SymbolicName" value="org.apache.xmlgraphics"/>
-+        <attribute name="Bundle-Version"   value="${version}"/>
++        <attribute name="Bundle-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/)"/>
++        <attribute name="Bundle-Version" value="${version}.0"/>
++        <attribute name="Export-Package" value="org.apache.xmlgraphics.util.i18n;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.util;uses:=&quot;javax.imageio.metadata,org.w3c.dom,org.xml.sax&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.util.io;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.util.uri;uses:=&quot;javax.xml.transform&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.util.dijkstra;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.xmp;uses:=&quot;javax.xml.transform,org.apache.xmlgraphics.util,org.apache.xmlgraphics.xmp.merge,org.xml.sax,org.xml.sax.helpers&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.xmp.schemas;uses:=&quot;org.apache.xmlgraphics.util,org.apache.xmlgraphics.xmp,org.apache.xmlgraphics.xmp.merge&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.xmp.schemas.pdf;uses:=&quot;org.apache.xmlgraphics.xmp,org.apache.xmlgraphics.xmp.merge&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.xmp.merge;uses:=&quot;org.apache.xmlgraphics.util,org.apache.xmlgraphics.xmp&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.io;uses:=&quot;javax.xml.transform&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.image.codec.util;uses:=&quot;javax.imageio.stream&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.image.codec.png;uses:=&quot;javax.imageio.stream,org.apache.commons.logging,org.apache.xmlgraphics.image.codec.util,org.apache.xmlgraphics.image.loader,org.apache.xmlgraphics.image.rendered&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.image.codec.tiff;uses:=&quot;org.apache.xmlgraphics.image.codec.util,org.apache.xmlgraphics.image.rendered&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.image.loader.util;uses:=&quot;javax.imageio.stream,javax.xml.transform,org.apache.xmlgraphics.image.codec.util,org.apache.xmlgraphics.image.loader&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.image.loader;uses:=&quot;javax.imageio.stream,javax.xml.transform,org.apache.commons.logging,org.apache.xmlgraphics.image.loader.cache,org.apache.xmlgraphics.image.loader.pipeline,org.apache.xmlgraphics.image.loader.spi&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.image.loader.spi;uses:=&quot;javax.xml.transform,org.apache.commons.logging,org.apache.xmlgraphics.image.loader,org.apache.xmlgraphics.image.loader.util&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.image.loader.cache;uses:=&quot;org.apache.commons.logging,org.apache.xmlgraphics.image.loader&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.image.loader.pipeline;uses:=&quot;org.apache.commons.logging,org.apache.xmlgraphics.image.loader,org.apache.xmlgraphics.image.loader.cache,org.apache.xmlgraphics.image.loader.spi,org.apache.xmlgraphics.image.loader.util,org.apache.xmlgraphics.util.dijkstra&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.image.rendered;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.image.writer;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.image.writer.imageio;uses:=&quot;javax.imageio,javax.imageio.event,javax.imageio.metadata,org.apache.xmlgraphics.image.writer,org.w3c.dom&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.image;uses:=&quot;org.apache.xmlgraphics.image.rendered&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.java2d;uses:=&quot;org.apache.xmlgraphics.ps&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.java2d.ps;uses:=&quot;org.apache.xmlgraphics.java2d,org.apache.xmlgraphics.ps&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.java2d.color;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.java2d.color.profile;uses:=&quot;org.apache.xmlgraphics.java2d.color&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.fonts;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.ps.dsc;uses:=&quot;org.apache.xmlgraphics.ps,org.apache.xmlgraphics.ps.dsc.events&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.ps.dsc.events;uses:=&quot;org.apache.xmlgraphics.ps,org.apache.xmlgraphics.ps.dsc&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.ps.dsc.tools;uses:=&quot;org.apache.xmlgraphics.ps,org.apache.xmlgraphics.ps.dsc,org.apache.xmlgraphics.ps.dsc.events&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.ps;uses:=&quot;javax.xml.transform,org.apache.xmlgraphics.ps.dsc&quot;;version=&quot;${version}.0&quot;"/>
++        <attribute name="Import-Package" value="javax.imageio,javax.imageio.event,javax.imageio.metadata,javax.imageio.plugins.jpeg,javax.imageio.spi,javax.imageio.stream,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.sax,javax.xml.transform.stream,org.apache.commons.io;version=&quot;[1.4,2)&quot;,org.apache.commons.io.output;version=&quot;[1.4,2)&quot;,org.apache.commons.logging;version=&quot;[1.2,2)&quot;,org.apache.xmlgraphics.fonts,org.apache.xmlgraphics.image,org.apache.xmlgraphics.image.codec.tiff,org.apache.xmlgraphics.image.codec.util,org.apache.xmlgraphics.image.loader,org.apache.xmlgraphics.image.loader.cache,org.apache.xmlgraphics.image.loader.spi,org.apache.xmlgraphics.image.loader.util,org.apache.xmlgraphics.image.rendered,org.apache.xmlgraphics.image.writer,org.apache.xmlgraphics.io,org.apache.xmlgraphics.java2d,org.apache.xmlgraphics.java2d.color,org.apache.xmlgraphics.java2d.color.profile,org.apache.xmlgraphics.ps,org.apache.xmlgraphics.ps.dsc,org.apache.xmlgraphics.ps.dsc.events,org.apache.xmlgraphics.ps.dsc.tools,org.apache.xmlgraphics.util,org.apache.xmlgraphics.util.dijkstra,org.apache.xmlgraphics.util.i18n,org.apache.xmlgraphics.util.io,org.apache.xmlgraphics.xmp,org.apache.xmlgraphics.xmp.merge,org.apache.xmlgraphics.xmp.schemas,org.apache.xmlgraphics.xmp.schemas.pdf,org.w3c.dom,org.xml.sax,org.xml.sax.helpers"/>
++        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target}))&quot;"/>
        </manifest>
        <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
      </jar>
-@@ -357,20 +358,13 @@
+@@ -357,20 +367,13 @@
    </target>
  
    <target name="junit" depends="junit-basic" description="Runs all JUnit tests" if="junit.present">
diff --git a/xmlgraphics-commons.changes b/xmlgraphics-commons.changes
index f55d90a..a527908 100644
--- a/xmlgraphics-commons.changes
+++ b/xmlgraphics-commons.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Apr  3 12:42:45 UTC 2020 - Fridrich Strba <fstrba@suse.com>
+
+- Modified patch:
+  * xmlgraphics-commons-build_xml.patch
+    + improve a bit more the OSGi manifest to be able to use it
+      from eclipse
+
 -------------------------------------------------------------------
 Sat Jan 19 08:03:42 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
@@ -10,7 +18,7 @@ Sat Jan 19 08:03:42 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 -------------------------------------------------------------------
 Tue Aug 28 13:44:48 UTC 2018 - tchvatal@suse.com
 
-- Do not run target  maven_artifacts as it just copies file from a->b
+- Do not run target maven_artifacts as it just copies file from a->b
   and fails with newer ant
 
 -------------------------------------------------------------------
diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 3f22e6d..69b1c7c 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xmlgraphics-commons
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 # Copyright (c) 2000-2008, JPackage Project
 #
 # All modifications and additions to the file contributed by third parties