diff --git a/.gitignore b/.gitignore
index a31175f..85aa31a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 batik-repack-1.7.zip
 batik-orbit-manifests.tar.gz
+batik-1.6-orbit-manifests.tar.gz
+batik-1.7-orbit-manifests.tar.gz
diff --git a/batik-1.6-nosmilInDOMSVGManifest.patch b/batik-1.6-nosmilInDOMSVGManifest.patch
new file mode 100644
index 0000000..0add895
--- /dev/null
+++ b/batik-1.6-nosmilInDOMSVGManifest.patch
@@ -0,0 +1,12 @@
+--- ./batik-dom-svg-MANIFEST.MF	2011-07-08 13:40:27.911556763 -0400
++++ ./batik-dom-svg-MANIFEST.MF	2011-07-08 13:41:33.834333213 -0400
+@@ -8,8 +8,7 @@
+  g.apache.batik.dom;bundle-version="[1.6.0,1.7.0)",org.apache.batik.pa
+  rser;bundle-version="[1.6.0,1.7.0)",org.apache.batik.util;bundle-vers
+  ion="[1.6.0,1.7.0)",org.w3c.css.sac;bundle-version="[1.3.0,1.4.0)",or
+- g.w3c.dom.smil;bundle-version="[1.0.0,1.1.0)",org.w3c.dom.svg;bundle-
+- version="[1.1.0,1.3.0)"
++ g.w3c.dom.svg;bundle-version="[1.1.0,1.3.0)"
+ Bundle-Version: 1.6.0.v201011041432
+ Export-Package: org.apache.batik.dom.svg;version="1.6.0",org.apache.ba
+  tik.dom.svg12;version="1.6.0"
diff --git a/batik-1.7-nosmilInDOMSVGManifest.patch b/batik-1.7-nosmilInDOMSVGManifest.patch
new file mode 100644
index 0000000..4fc4d35
--- /dev/null
+++ b/batik-1.7-nosmilInDOMSVGManifest.patch
@@ -0,0 +1,9 @@
+--- batik-dom-svg-MANIFEST.MF	2011-07-08 14:10:12.527952393 -0400
++++ batik-dom-svg-MANIFEST.MF	2011-07-08 14:10:38.468245610 -0400
+@@ -22,5 +22,5 @@
+ Implementation-Version: 1.7+r608262
+ Import-Package: org.w3c.dom.svg;version="[1.1.0,1.3.0)",org.w3c.dom.ev
+  ents;version="[3.0.0,4.0.0)",org.w3c.css.sac;version="[1.3.0,1.4.0)";
+- provenance=W3C,org.w3c.dom.smil;version="[1.0.0,1.1.0)"
++ provenance=W3C
+ Bundle-ManifestVersion: 2
diff --git a/batik.spec b/batik.spec
index 8445b67..08aee6b 100644
--- a/batik.spec
+++ b/batik.spec
@@ -1,6 +1,6 @@
 Name:           batik
 Version:        1.7
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Scalable Vector Graphics for Java
 License:        ASL 2.0
 URL:            http://xml.apache.org/batik/
@@ -14,13 +14,28 @@ Source4:        %{name}.rasterizer.script
 Source5:        %{name}.slideshow.script
 Source6:        %{name}-squiggle.desktop
 Source7:        %{name}-repack.sh
-Source8:        %{name}-orbit-manifests.tar.gz
+# These manifests with OSGi metadata are taken from the Eclipse Orbit
+# project:  http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/
+#
+# for f in `ls *.jar`; do unzip -d `basename $f .jar | sed s/_.*//` $f; done
+# for f in `find -name MANIFEST.MF`; do mv $f $(echo $f | sed "s|./org.apache.||" | sed "s|/META-INF/|-|" | sed "s/\./-/g" | sed "s|MANIFEST-MF|MANIFEST.MF|"); done
+# Then manually remove all lines containing MD5sums/crypto hashes.
+# tar czf batik-1.6-orbit-manifests.tar.gz *.MF
+#
+# FIXME:  move to 1.7 manifests
+Source8:        %{name}-1.6-orbit-manifests.tar.gz
 
 
 Patch0:         %{name}-manifests.patch
 Patch1:         %{name}-policy.patch
 # remove dependency on bundled rhino from pom
 Patch2:		%{name}-script-remove-js.patch
+# SMIL in Fedora has been merged into xml-commons-apis-ext like it has
+# been upstream.  It's easier to take the OSGi manifests from Orbit 
+# directly and patch this one.
+#
+# FIXME:  move to 1.7 manifest from Eclipse Orbit project
+Patch3:         %{name}-1.6-nosmilInDOMSVGManifest.patch
 Requires:       rhino >= 1.5
 
 BuildArch:      noarch
@@ -140,6 +155,7 @@ rm -f `find -name properties`
 mkdir orbit
 pushd orbit
 tar xzf %{SOURCE8}
+%patch3
 popd
 
 # create poms from templates
@@ -365,6 +381,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 
 %changelog
+* Fri Jul 8 2011 Andrew Overholt <overholt@redhat.com> 1.7-12
+- New OSGi manifests from Eclipse Orbit.
+
 * Tue May  3 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.7-11
 - Add maven metadata and pom files
 - Versionless jars & javadocs
diff --git a/sources b/sources
index d354596..b862a44 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 207f23ed2d90e9b9982f739398834c4d  batik-repack-1.7.zip
-0a704013b27f1ee5c756ffad3cccdbe8  batik-orbit-manifests.tar.gz
+dd117ec24522ed3f06ff2c280333132e  batik-1.6-orbit-manifests.tar.gz
+a1c9c666cbf529958cc567f44bd76abb  batik-1.7-orbit-manifests.tar.gz