diff --git a/MANIFEST.MF b/MANIFEST.MF
new file mode 100644
index 0000000..f662f36
--- /dev/null
+++ b/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Jakarta Oro
+Bundle-SymbolicName: org.apache.oro
+Bundle-Version: 2.0.8
+Bundle-Vendor: Apache Software Foundation
+Bundle-Localization: plugin
+Export-Package: org.apache.oro.io;version="2.0.8", org.apache.oro.text
+ ;version="2.0.8", org.apache.oro.text.awk;version="2.0.8", org.apache
+ .oro.text.perl;version="2.0.8", org.apache.oro.text.regex;version="2.
+ 0.8", org.apache.oro.util;version="2.0.8"
+Bundle-RequiredExecutionEnvironment: J2SE-1.2
+
diff --git a/jakarta-oro-build-xml.patch b/jakarta-oro-build-xml.patch
new file mode 100644
index 0000000..daa6c33
--- /dev/null
+++ b/jakarta-oro-build-xml.patch
@@ -0,0 +1,29 @@
+diff -up ./build.xml.fix ./build.xml
+--- ./build.xml.fix	2009-06-23 13:51:46.000000000 -0400
++++ ./build.xml	2009-06-23 13:52:21.000000000 -0400
+@@ -126,23 +126,8 @@ Run ant -projecthelp for complete list o
+         <jar jarfile="${top.dir}/${final.name}.jar"
+             basedir="${build.dest}"
+             includes="org/**,META-INF/**"
+-            excludes="**/package.html,**/overview.html">
+-          <manifest>
+-            <section name="org/apache/oro">
+-             <attribute name="Specification-Title"
+-                     value="Jakarta ORO" />
+-             <attribute name="Specification-Version"
+-                     value="${version}" />
+-             <attribute name="Specification-Vendor"
+-                     value="Apache Software Foundation" />
+-             <attribute name="Implementation-Title"
+-                     value="org.apache.oro" />
+-             <attribute name="Implementation-Version"
+-                     value="${version} ${DATE}" />
+-             <attribute name="Implementation-Vendor"
+-                     value="Apache Software Foundation" />
+-            </section>
+-           </manifest>
++            excludes="**/package.html,**/overview.html"
++            manifest="MANIFEST.MF">
+         </jar>
+     </target>
+ 
diff --git a/jakarta-oro.spec b/jakarta-oro.spec
index 2bf5ff2..d5fe926 100644
--- a/jakarta-oro.spec
+++ b/jakarta-oro.spec
@@ -38,12 +38,14 @@
 
 Name:           jakarta-oro
 Version:        2.0.8
-Release:        5.2%{?dist}
+Release:        5.3%{?dist}
 Epoch:		0
 Summary:        Full regular expressions API
 License:        ASL 1.1
 Group:          Development/Java
 Source0:        %{name}-%{version}.tar.gz
+Source1:        MANIFEST.MF
+Patch1:         %{name}-build-xml.patch
 URL:            http://jakarta.apache.org/oro
 BuildRequires:  jpackage-utils > 1.6
 BuildRequires:  ant
@@ -94,6 +96,9 @@ find . -name "*.jar" -exec rm -f {} \;
 for dir in `find . -type d -name CVS`; do rm -rf $dir; done
 for file in `find . -type f -name .cvsignore`; do rm -rf $file; done
 
+%patch1
+cp %{SOURCE1} .
+
 %build
 ant -Dfinal.name=%{base_name} jar javadocs
 
@@ -158,6 +163,9 @@ fi
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Tue Jun 23 2009 Jeff Johnston <jjohnstn@redhat.com> - 0:2.0.8-5.3
+- Add OSGi metadata to Manifest.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.0.8-5.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild