diff --git a/java_cup-MANIFEST.MF b/java_cup-MANIFEST.MF
new file mode 100644
index 0000000..4b3ffba
--- /dev/null
+++ b/java_cup-MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Bundle-Name: Java Cup
+Bundle-SymbolicName: java_cup
+Export-Package: java_cup,java_cup.runtime
+Bundle-Version: 0.11.0
+Bundle-ManifestVersion: 2
+Main-Class: java_cup/Main
diff --git a/java_cup-runtime-MANIFEST.MF b/java_cup-runtime-MANIFEST.MF
index 6d79887..a644cbf 100644
--- a/java_cup-runtime-MANIFEST.MF
+++ b/java_cup-runtime-MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Name: %pluginName
+Bundle-Name: Java Cup Runtime
 Bundle-SymbolicName: java_cup.runtime
 Export-Package: java_cup.runtime
 Bundle-Version: 0.11.0
diff --git a/java_cup.spec b/java_cup.spec
index d0732d3..2b5af6f 100644
--- a/java_cup.spec
+++ b/java_cup.spec
@@ -34,7 +34,7 @@
 
 Name:           java_cup
 Version:        0.11a
-Release:        14%{?dist}
+Release:        15%{?dist}
 Epoch:          1
 Summary:        Java source interpreter
 License:        MIT
@@ -43,7 +43,9 @@ URL:            http://www.cs.princeton.edu/%7Eappel/modern/java/CUP/
 #tar cjf java_cup-0.11a.tar.bz2 java_cup-0.11a/
 Source0:        java_cup-0.11a.tar.bz2
 Source1:        java_cup-pom.xml
-Source2:        %{name}-runtime-MANIFEST.MF
+# Add OSGi manifests
+Source2:        %{name}-MANIFEST.MF
+Source4:        %{name}-runtime-MANIFEST.MF
 # Taken from http://www2.cs.tum.edu/projects/cup/
 Source3:        LICENSE.txt
 Patch0:         %{name}-build.patch
@@ -112,10 +114,13 @@ find -name parser.cup -delete
 ant javadoc
 
 %install
-# inject OSGi manifest
+# inject OSGi manifests
 mkdir -p META-INF
 cp -p %{SOURCE2} META-INF/MANIFEST.MF
 touch META-INF/MANIFEST.MF
+zip -u dist/java-cup-%{pkg_version}.jar META-INF/MANIFEST.MF
+cp -p %{SOURCE4} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
 zip -u dist/java-cup-%{pkg_version}-runtime.jar META-INF/MANIFEST.MF
 
 # jar
@@ -146,6 +151,9 @@ cp -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
+* Sat Aug 31 2013 Mat Booth <fedora@matbooth.co.uk> - 1:0.11a-15
+- Inject OSGi manifests into both jars.
+
 * Fri Aug 30 2013 Mat Booth <fedora@matbooth.co.uk> - 1:0.11a-14
 - Patch so that generated action methods do not exceed the 65535 byte JVM
   method size limit. Supplied by eclipse-pdt project.