diff --git a/jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF b/jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF
deleted file mode 100644
index 3296d01ce07..00000000000
--- a/jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,58 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Jetty-OSGi-Jasper integration
-Fragment-Host: org.eclipse.jetty.osgi.boot
-Bundle-SymbolicName: org.eclipse.jetty.osgi.boot.jsp
-Bundle-Version: 7.6.4.qualifier
-Bundle-Vendor: Mort Bay Consulting
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: com.sun.el;resolution:=optional,
- com.sun.el.lang;resolution:=optional,
- com.sun.el.parser;resolution:=optional,
- com.sun.el.util;resolution:=optional,
- com.sun.org.apache.commons.logging;split=glassfish;version="[2.1,3)";resolution:=optional,
- javax.el;version="1.0.0";resolution:=optional,
- javax.servlet;version="2.5.0",
- javax.servlet.jsp;version="2.1.0",
- javax.servlet.jsp.el;version="2.1.0",
- javax.servlet.jsp.jstl.core;version="1.2.0";resolution:=optional,
- javax.servlet.jsp.jstl.fmt;version="1.2.0";resolution:=optional,
- javax.servlet.jsp.jstl.sql;version="1.2.0";resolution:=optional,
- javax.servlet.jsp.jstl.tlv;version="1.2.0";resolution:=optional,
- javax.servlet.jsp.resources;version="2.1.0",
- javax.servlet.jsp.tagext;version="2.1.0",
- javax.servlet.resources;version="2.5.0",
- org.apache.jasper;version="6.0.0";resolution:=optional,
- org.apache.jasper.compiler;version="6.0.0";resolution:=optional,
- org.apache.jasper.compiler.tagplugin;version="6.0.0";resolution:=optional,
- org.apache.jasper.runtime;version="6.0.0";resolution:=optional,
- org.apache.jasper.security;version="6.0.0";resolution:=optional,
- org.apache.jasper.servlet;version="6.0.0";resolution:=optional,
- org.apache.jasper.tagplugins.jstl;version="6.0.0";resolution:=optional,
- org.apache.jasper.util;version="6.0.0";resolution:=optional,
- org.apache.jasper.xmlparser;version="6.0.0";resolution:=optional,
- org.glassfish.jsp.api;version="2.1.3";resolution:=optional,
- org.apache.taglibs.standard;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.extra.spath;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.functions;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.lang.jstl;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.lang.jstl.parser;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.lang.jstl.test;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.lang.jstl.test.beans;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.lang.support;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.resources;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.tag.common.core;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.tag.common.fmt;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.tag.common.sql;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.tag.common.xml;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.tag.el.core;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.tag.el.fmt;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.tag.el.sql;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.tag.el.xml;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.tag.rt.core;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.tag.rt.fmt;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.tag.rt.sql;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.tag.rt.xml;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.tei;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.tlv;version="1.2.0";resolution:=optional,
- org.eclipse.jetty.jsp;version="[7.0,8.0)";resolution:=optional
diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
index 443b259761f..b8c6ba97a3f 100644
--- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
@@ -46,22 +46,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>process-resources</phase>
-            <configuration>
-              <tasks>
-                <replace file="target/classes/META-INF/MANIFEST.MF" token="Bundle-Version: 7.4.1.qualifier" value="Bundle-Version: ${parsedVersion.osgiVersion}" />
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -85,6 +69,85 @@
           </archive>
         </configuration>
       </plugin>
+      <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <extensions>true</extensions>
+          <executions>
+              <execution>
+                  <id>bundle-manifest</id>
+                  <phase>process-classes</phase>
+                  <goals>
+                      <goal>manifest</goal>
+                  </goals>
+              </execution>
+          </executions>
+          <configuration>
+              <instructions>
+                <Bundle-SymbolicName>org.eclipse.jetty.osgi.boot.jsp</Bundle-SymbolicName>
+                <Bundle-Name>Jetty-OSGi-Jasper Integration</Bundle-Name>
+                <Bundle-Classpath></Bundle-Classpath>
+                <Fragment-Host>org.eclipse.jetty.osgi.boot</Fragment-Host>
+                <Export-Package>!org.eclipse.jetty.osgi.boot.*</Export-Package>
+                <Import-Package>com.sun.el;resolution:=optional,
+ com.sun.el.lang;resolution:=optional,
+ com.sun.el.parser;resolution:=optional,
+ com.sun.el.util;resolution:=optional,
+ com.sun.org.apache.commons.logging;split=glassfish;version="[2.1,3)";resolution:=optional,
+ javax.el;version="1.0.0";resolution:=optional,
+ javax.servlet;version="2.5.0",
+ javax.servlet.jsp;version="2.1.0",
+ javax.servlet.jsp.el;version="2.1.0",
+ javax.servlet.jsp.jstl.core;version="1.2.0";resolution:=optional,
+ javax.servlet.jsp.jstl.fmt;version="1.2.0";resolution:=optional,
+ javax.servlet.jsp.jstl.sql;version="1.2.0";resolution:=optional,
+ javax.servlet.jsp.jstl.tlv;version="1.2.0";resolution:=optional,
+ javax.servlet.jsp.resources;version="2.1.0",
+ javax.servlet.jsp.tagext;version="2.1.0",
+ javax.servlet.resources;version="2.5.0",
+ org.apache.jasper;version="6.0.0";resolution:=optional,
+ org.apache.jasper.compiler;version="6.0.0";resolution:=optional,
+ org.apache.jasper.compiler.tagplugin;version="6.0.0";resolution:=optional,
+ org.apache.jasper.runtime;version="6.0.0";resolution:=optional,
+ org.apache.jasper.security;version="6.0.0";resolution:=optional,
+ org.apache.jasper.servlet;version="6.0.0";resolution:=optional,
+ org.apache.jasper.tagplugins.jstl;version="6.0.0";resolution:=optional,
+ org.apache.jasper.util;version="6.0.0";resolution:=optional,
+ org.apache.jasper.xmlparser;version="6.0.0";resolution:=optional,
+ org.glassfish.jsp.api;version="2.1.3";resolution:=optional,
+ org.apache.taglibs.standard;version="1.2.0";resolution:=optional,
+ org.apache.taglibs.standard.extra.spath;version="1.2.0";resolution:=optional,
+ org.apache.taglibs.standard.functions;version="1.2.0";resolution:=optional,
+ org.apache.taglibs.standard.lang.jstl;version="1.2.0";resolution:=optional,
+ org.apache.taglibs.standard.lang.jstl.parser;version="1.2.0";resolution:=optional,
+ org.apache.taglibs.standard.lang.jstl.test;version="1.2.0";resolution:=optional,
+ org.apache.taglibs.standard.lang.jstl.test.beans;version="1.2.0";resolution:=optional,
+ org.apache.taglibs.standard.lang.support;version="1.2.0";resolution:=optional,
+ org.apache.taglibs.standard.resources;version="1.2.0";resolution:=optional,
+ org.apache.taglibs.standard.tag.common.core;version="1.2.0";resolution:=optional,
+ org.apache.taglibs.standard.tag.common.fmt;version="1.2.0";resolution:=optional,
+ org.apache.taglibs.standard.tag.common.sql;version="1.2.0";resolution:=optional,
+ org.apache.taglibs.standard.tag.common.xml;version="1.2.0";resolution:=optional,
+ org.apache.taglibs.standard.tag.el.core;version="1.2.0";resolution:=optional,
+ org.apache.taglibs.standard.tag.el.fmt;version="1.2.0";resolution:=optional,
+ org.apache.taglibs.standard.tag.el.sql;version="1.2.0";resolution:=optional,
+ org.apache.taglibs.standard.tag.el.xml;version="1.2.0";resolution:=optional,
+ org.apache.taglibs.standard.tag.rt.core;version="1.2.0";resolution:=optional,
+ org.apache.taglibs.standard.tag.rt.fmt;version="1.2.0";resolution:=optional,
+ org.apache.taglibs.standard.tag.rt.sql;version="1.2.0";resolution:=optional,
+ org.apache.taglibs.standard.tag.rt.xml;version="1.2.0";resolution:=optional,
+ org.apache.taglibs.standard.tei;version="1.2.0";resolution:=optional,
+ org.apache.taglibs.standard.tlv;version="1.2.0";resolution:=optional,
+ org.eclipse.jetty.jsp;version="[7.0,8.0)";resolution:=optional,
+ !org.osgi.*,
+ !org.xml.*,
+ !org.eclipse.jetty.*,
+ *
+                </Import-Package>
+                <_nouses>true</_nouses>
+              </instructions>
+          </configuration>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
diff --git a/jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF b/jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
deleted file mode 100644
index 7e688553cc9..00000000000
--- a/jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Jetty-OSGi-Logback integration
-Fragment-Host: org.eclipse.jetty.osgi.boot
-Bundle-SymbolicName: org.eclipse.jetty.osgi.boot.logback;singleton:=true
-Bundle-Version: 7.6.4.qualifier
-Bundle-Vendor: Mort Bay Consulting
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: ch.qos.logback.classic,
- ch.qos.logback.classic.joran,
- ch.qos.logback.core,
- ch.qos.logback.core.joran,
- ch.qos.logback.core.joran.spi,
- ch.qos.logback.core.spi,
- ch.qos.logback.core.util,
- ch.qos.logback.access.jetty.v7;resolution:=optional,
- org.apache.commons.logging;resolution:=optional,
- org.apache.log4j;resolution:=optional,
- org.osgi.framework,
- org.slf4j
diff --git a/jetty-osgi/jetty-osgi-boot-logback/pom.xml b/jetty-osgi/jetty-osgi-boot-logback/pom.xml
index 749050bd323..2e8fcd40dbf 100644
--- a/jetty-osgi/jetty-osgi-boot-logback/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-logback/pom.xml
@@ -55,22 +55,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>process-resources</phase>
-            <configuration>
-              <tasks>
-                <replace file="target/classes/META-INF/MANIFEST.MF" token="Bundle-Version: 7.3.0.qualifier" value="Bundle-Version: ${parsedVersion.osgiVersion}" />
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -94,6 +78,39 @@
           </archive>
         </configuration>
       </plugin>
+      <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <extensions>true</extensions>
+          <executions>
+              <execution>
+                  <id>bundle-manifest</id>
+                  <phase>process-classes</phase>
+                  <goals>
+                      <goal>manifest</goal>
+                  </goals>
+              </execution>
+          </executions>
+          <configuration>
+              <instructions>
+                <Bundle-SymbolicName>org.eclipse.jetty.osgi.boot.logback;singleton:=true</Bundle-SymbolicName>
+                <Bundle-Name>Jetty-OSGi-Logback Integration</Bundle-Name>
+                <Fragment-Host>org.eclipse.jetty.osgi.boot</Fragment-Host>
+                <Import-Package>
+ch.qos.logback.classic,ch.qos.logback.classic.joran,
+ch.qos.logback.core,ch.qos.logback.core.joran,
+ch.qos.logback.core.joran.spi,ch.qos.logback.core.spi,
+ch.qos.logback.core.util,ch.qos.logback.access.jetty.v7;resolution:=optional,
+org.apache.commons.logging;resolution:=optional,
+org.apache.log4j;resolution:=optional,
+org.osgi.framework,
+org.slf4j,
+*
+                </Import-Package>
+                <_nouses>true</_nouses>
+              </instructions>
+          </configuration>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
diff --git a/jetty-osgi/jetty-osgi-boot-warurl/META-INF/MANIFEST.MF b/jetty-osgi/jetty-osgi-boot-warurl/META-INF/MANIFEST.MF
deleted file mode 100644
index 80ce2c2fac6..00000000000
--- a/jetty-osgi/jetty-osgi-boot-warurl/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Support for rfc66 war url scheme
-Bundle-SymbolicName: org.eclipse.jetty.osgi.boot.warurl;singleton:=true
-Bundle-Version: 7.6.4.qualifier
-Bundle-Activator: org.eclipse.jetty.osgi.boot.warurl.WarUrlActivator
-Bundle-Vendor: Mort Bay Consulting
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: org.eclipse.jetty.util,
- org.osgi.framework,
- org.osgi.service.url
diff --git a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
index 7e328902b9a..95a494ab95c 100644
--- a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
@@ -25,22 +25,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>process-resources</phase>
-            <configuration>
-              <tasks>
-                <replace file="target/classes/META-INF/MANIFEST.MF" token="Bundle-Version: 7.3.0.qualifier" value="Bundle-Version: ${parsedVersion.osgiVersion}" />
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -64,6 +48,28 @@
           </archive>
         </configuration>
       </plugin>
+      <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <extensions>true</extensions>
+          <executions>
+              <execution>
+                  <id>bundle-manifest</id>
+                  <phase>process-classes</phase>
+                  <goals>
+                      <goal>manifest</goal> 
+                  </goals>
+              </execution>
+          </executions>
+          <configuration>
+              <instructions>
+                  <Bundle-SymbolicName>org.eclipse.jetty.osgi.boot.warurl;singleton:=true</Bundle-SymbolicName>
+                  <Bundle-Name>RFC66 War URL</Bundle-Name>
+                  <Bundle-Activator>org.eclipse.jetty.osgi.boot.warurl.WarUrlActivator</Bundle-Activator>
+                  <_nouses>true</_nouses>
+              </instructions>
+          </configuration>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
diff --git a/jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF b/jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF
deleted file mode 100644
index 6df8a86243e..00000000000
--- a/jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,46 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Jetty OSGi bootstrap
-Bundle-SymbolicName: org.eclipse.jetty.osgi.boot;singleton:=true
-Bundle-Vendor: Mort Bay Consulting
-Bundle-Version: 7.6.4.qualifier
-Bundle-Activator: org.eclipse.jetty.osgi.boot.JettyBootstrapActivator
-Import-Package: javax.mail;version="1.4.0";resolution:=optional,
- javax.mail.event;version="1.4.0";resolution:=optional,
- javax.mail.internet;version="1.4.0";resolution:=optional,
- javax.mail.search;version="1.4.0";resolution:=optional,
- javax.mail.util;version="1.4.0";resolution:=optional,
- javax.servlet;version="2.5.0",
- javax.servlet.http;version="2.5.0",
- javax.transaction;version="1.1.0";resolution:=optional,
- javax.transaction.xa;version="1.1.0";resolution:=optional,
- org.eclipse.jetty.deploy;version="7.6.4",
- org.eclipse.jetty.deploy.providers;version="7.6.4",
- org.eclipse.jetty.http;version="7.6.4",
- org.eclipse.jetty.nested;version="7.6.4";resolution:=optional,
- org.eclipse.jetty.server;version="7.6.4",
- org.eclipse.jetty.server.handler;version="7.6.4",
- org.eclipse.jetty.servlet;version="7.6.4",
- org.eclipse.jetty.util;version="7.6.4",
- org.eclipse.jetty.util.component;version="7.6.4",
- org.eclipse.jetty.util.log;version="7.6.4",
- org.eclipse.jetty.util.resource;version="7.6.4",
- org.eclipse.jetty.webapp;version="7.6.4",
- org.eclipse.jetty.xml;version="7.6.4",
- org.osgi.framework,
- org.osgi.service.cm;version="1.2.0",
- org.osgi.service.packageadmin,
- org.osgi.service.startlevel;version="1.0",
- org.osgi.service.url;version="1.0.0",
- org.osgi.util.tracker;version="1.3.0",
- org.slf4j;resolution:=optional,
- org.slf4j.helpers;resolution:=optional,
- org.slf4j.spi;resolution:=optional,
- org.xml.sax,
- org.xml.sax.helpers
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Classpath: .
-Export-Package: org.eclipse.jetty.osgi.boot;version="7.6.4",
- org.eclipse.jetty.osgi.nested;version="7.6.4",
- org.eclipse.jetty.osgi.boot.utils;version="7.6.4"
-DynamicImport-Package: org.eclipse.jetty.*;version="[7.4,8)"
diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml
index 6da5dabb760..884816ebba9 100644
--- a/jetty-osgi/jetty-osgi-boot/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot/pom.xml
@@ -100,9 +100,11 @@
                 </executions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>org.eclipse.jetty.osgi.boot</Bundle-SymbolicName>
-                        <Export-Package>org.eclipse.jetty.osgi.boot;version="${parsedVersion.osgiVersion}",org.eclipse.jetty.osgi.boot.utils,org.eclipse.jetty.osgi.nested;version="${parsedVersion.osgiVersion}"</Export-Package> 
+                        <Bundle-SymbolicName>org.eclipse.jetty.osgi.boot;singleton:=true</Bundle-SymbolicName>
+                        <Bundle-Name>Jetty OSGi Boot</Bundle-Name>
                         <Bundle-Activator>org.eclipse.jetty.osgi.boot.JettyBootstrapActivator</Bundle-Activator>
+                        <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+                        <Export-Package>org.eclipse.jetty.osgi.boot;version="${parsedVersion.osgiVersion}",org.eclipse.jetty.osgi.boot.utils,org.eclipse.jetty.osgi.nested;version="${parsedVersion.osgiVersion}"</Export-Package> 
                         <!-- disable the uses directive: jetty will accomodate pretty much any versions
                         of the packages it uses; no need to reflect some tight dependency determined at
                         compilation time. --> 
@@ -130,9 +132,9 @@
  org.eclipse.jetty.nested;resolution:=optional,
  *
                         </Import-Package>
-                        <DynamicImport-Package>org.eclipse.jetty.*;version="[7.3,8)"</DynamicImport-Package>
+                        <DynamicImport-Package>org.eclipse.jetty.*;version="[7.6,8)"</DynamicImport-Package>
                         <!--Require-Bundle/-->
-                        <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment> 
+                        <!-- Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment --> 
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF b/jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
deleted file mode 100644
index a76b521a221..00000000000
--- a/jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Console
-Bundle-SymbolicName: org.eclipse.jetty.osgi.equinoxtools
-Bundle-Description: Example application: equinox console accesssible on the web
-Bundle-Version: 7.6.4.qualifier
-Bundle-Activator: org.eclipse.jetty.osgi.equinoxtools.WebEquinoxToolsActivator
-Import-Package: javax.servlet;version="2.5.0",
- javax.servlet.http;version="2.5.0",
- org.eclipse.jetty.continuation;version="7.6.4",
- org.eclipse.jetty.io;version="7.6.4",
- org.eclipse.jetty.util;version="7.6.4",
- org.eclipse.jetty.util.log;version="7.6.4",
- org.eclipse.jetty.websocket;version="7.6.4",
- org.eclipse.osgi.framework.console;version="1.1.0",
- org.osgi.framework;version="1.3.0",
- org.osgi.service.http;version="1.2.0",
- org.osgi.util.tracker;version="1.3.0"
-Export-Package: org.eclipse.jetty.osgi.equinoxtools;x-internal:=true;version="7.6.4",
- org.eclipse.jetty.osgi.equinoxtools.console;x-internal:=true;version="7.6.4"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
diff --git a/jetty-osgi/jetty-osgi-equinoxtools/pom.xml b/jetty-osgi/jetty-osgi-equinoxtools/pom.xml
index 50991315e07..f7a2a05a6f8 100644
--- a/jetty-osgi/jetty-osgi-equinoxtools/pom.xml
+++ b/jetty-osgi/jetty-osgi-equinoxtools/pom.xml
@@ -48,7 +48,6 @@
             <phase>process-resources</phase>
             <configuration>
               <tasks>
-                <replace file="target/classes/META-INF/MANIFEST.MF" token="Bundle-Version: 7.4.2.qualifier" value="Bundle-Version: ${parsedVersion.osgiVersion}" />
                 <copy todir="target/classes/equinoxconsole">
                     <fileset dir="equinoxconsole" />
                 </copy>
@@ -83,6 +82,31 @@
           </archive>
         </configuration>
       </plugin>
+      <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <extensions>true</extensions>
+          <executions>
+              <execution>
+                  <id>bundle-manifest</id>
+                  <phase>process-classes</phase>
+                  <goals>
+                      <goal>manifest</goal> 
+                  </goals>
+              </execution>
+          </executions>
+          <configuration>
+              <instructions>
+                <Bundle-SymbolicName>org.eclipse.jetty.osgi.equinoxtools</Bundle-SymbolicName>
+                <Bundle-Name>Console</Bundle-Name>
+                <Bundle-Activator>org.eclipse.jetty.osgi.equinoxtools.WebEquinoxToolsActivator</Bundle-Activator>
+                <Export-Package>org.eclipse.jetty.osgi.equinoxtools;x-internal:=true;version="${parsedVersion.osgiVersion}",
+                                org.eclipse.jetty.osgi.equinoxtools.console;x-internal:=true;version="${parsedVersion.osgiVersion}"
+                </Export-Package>
+                <_nouses>true</_nouses>
+              </instructions>
+          </configuration>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
diff --git a/jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF b/jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF
deleted file mode 100644
index 71df6c495cb..00000000000
--- a/jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-SymbolicName: org.eclipse.jetty.osgi.httpservice
-Bundle-Version: 7.6.4.qualifier
-Bundle-Vendor: Mort Bay Consulting
-Bundle-Name: OSGi HttpService provided by equinox HttpServiceServlet deployed on jetty
-Jetty-ContextFilePath: contexts/httpservice.xml
-Import-Package: javax.servlet;version="2.5.0",
- javax.servlet.http;version="2.5.0",
- org.eclipse.equinox.http.servlet,
- org.eclipse.jetty.server;version="7.6.4",
- org.eclipse.jetty.server.handler;version="7.6.4",
- org.eclipse.jetty.servlet;version="7.6.4",
- org.eclipse.jetty.util.component;version="7.6.4"
-Export-Package: org.eclipse.jetty.osgi.httpservice;version="7.6.4"
-
diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml
index 9a839b87964..a84e59ed654 100644
--- a/jetty-osgi/jetty-osgi-httpservice/pom.xml
+++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml
@@ -44,7 +44,6 @@
             <phase>process-resources</phase>
             <configuration>
               <tasks>
-                <replace file="target/classes/META-INF/MANIFEST.MF" token="Bundle-Version: 7.4.2.qualifier" value="Bundle-Version: ${parsedVersion.osgiVersion}" />
                 <copy todir="target/classes/contexts">
                     <fileset dir="contexts" />
                 </copy>
@@ -79,6 +78,33 @@
           </archive>
         </configuration>
       </plugin>
+      <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <extensions>true</extensions>
+          <executions>
+              <execution>
+                  <id>bundle-manifest</id>
+                  <phase>process-classes</phase>
+                  <goals>
+                      <goal>manifest</goal> 
+                  </goals>
+              </execution>
+          </executions>
+          <configuration>
+              <instructions>
+                <Bundle-SymbolicName>org.eclipse.jetty.osgi.httpservice</Bundle-SymbolicName>
+                <Bundle-Name>OSGi HttpService</Bundle-Name>
+                <Jetty-ContextFilePath>contexts/httpservice.xml</Jetty-ContextFilePath>
+                <Import-Package>org.eclipse.jetty.server.handler;version="[7.6,8)",
+org.eclipse.jetty.util.component;version="[7.6,8)",
+org.eclipse.equinox.http.servlet,
+*
+                 </Import-Package>
+                <_nouses>true</_nouses>
+              </instructions>
+          </configuration>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 2db8e8a01d8..be0f93a52f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -243,7 +243,7 @@
               <Bundle-Localization>plugin</Bundle-Localization>
               <Bundle-Classpath>.</Bundle-Classpath>
               <Export-Package>${bundle-symbolic-name}.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package>
-              <Bundle-Copyright>Copyright (c) 2008-2009 Mort Bay Consulting Pty. Ltd.</Bundle-Copyright>
+              <Bundle-Copyright>Copyright (c) 2008-2012 Mort Bay Consulting Pty. Ltd.</Bundle-Copyright>
               <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
             </instructions>
           </configuration>