diff --git a/batik.spec b/batik.spec
index 0a57fac..0b90893 100644
--- a/batik.spec
+++ b/batik.spec
@@ -2,7 +2,7 @@
 
 Name:           batik
 Version:        1.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Scalable Vector Graphics for Java
 License:        ASL 2.0 and W3C
 URL:            https://xmlgraphics.apache.org/batik/
@@ -109,17 +109,22 @@ cp -p %{SOURCE1} batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbr
 # eclipse expects xmlgraphics to be optional
 %pom_xpath_inject 'pom:dependency[pom:artifactId="xmlgraphics-commons"]' '<optional>true</optional>' batik-css
 
-for pom in `find -name pom.xml -not -path batik-all/pom.xml`; do
+# eclipse expects it there
+cp -pr batik-i18n/src/main/java/org/apache/batik/i18n batik-util/src/main/java/org/apache/batik/
+%pom_remove_dep :batik-i18n batik-util
+
+for pom in `find -mindepth 2 -name pom.xml -not -path ./batik-all/pom.xml`; do
     %pom_add_plugin org.apache.felix:maven-bundle-plugin $pom "
         <extensions>true</extensions>
         <configuration>
             <instructions>
-                <Bundle-SymbolicName>org.apache.batik.$(sed 's:batik-::;s:/pom.xml::' <<< $pom)</Bundle-SymbolicName>
+                <Bundle-SymbolicName>org.apache.batik.$(sed 's:./batik-::;s:/pom.xml::' <<< $pom)</Bundle-SymbolicName>
                 <!-- To prevent breaking eclipse -->
                 <Bundle-Version>1.7.0</Bundle-Version>
             </instructions>
         </configuration>
     "
+    %pom_xpath_inject pom:project '<packaging>bundle</packaging>' $pom
 done
 
 # for eclipse
@@ -182,6 +187,9 @@ cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name}/
 
 
 %changelog
+* Wed Apr 26 2017 Michael Simacek <msimacek@redhat.com> - 1.9-2
+- Fix OSGi metadata generation and eclipse compatibility
+
 * Thu Apr 20 2017 Michael Simacek <msimacek@redhat.com> - 1.9-1
 - Update to upstream version 1.9
 - Fixes CVE-2017-5662