diff --git a/security/pom.xml b/security/pom.xml
index fb53c207..9d880c65 100644
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -51,32 +51,6 @@
                 <groupId>com.springsource.bundlor</groupId>
                 <artifactId>com.springsource.bundlor.maven</artifactId>
             </plugin>
-<!--
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>org.springframework.bundle.ws.security</Bundle-SymbolicName>
-                        <Export-Package>org.springframework.ws.soap.security*;version="${pom.version}"</Export-Package>
-                        <Import-Package>
-                            org.apache.commons.logging*,
-                            javax.crypto*,
-                            javax.security*,
-                            javax.xml.namespace*,
-                            javax.xml.soap*,
-                            com.sun.xml.wss*,
-                            org.springframework.ws*;version="[${pom.version},${pom.version}]",
-                            org.springframework*;version="2.0",
-                            *;resolution:=optional
-                        </Import-Package>
-                        <Implementation-Title>${pom.name}</Implementation-Title>
-                        <Spring-WS-Version>${pom.version}</Spring-WS-Version>
-                        <Bundle-Vendor>SpringSource</Bundle-Vendor>
-                    </instructions>
-                </configuration>
-            </plugin>
--->
         </plugins>
     </build>
     <dependencies>
diff --git a/support/pom.xml b/support/pom.xml
index 03e3b4a5..51dff258 100644
--- a/support/pom.xml
+++ b/support/pom.xml
@@ -8,7 +8,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.ws</groupId>
     <artifactId>spring-ws-support</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Spring WS Support</name>
     <description>Spring Web Services Support package.</description>
     <repositories>
@@ -25,7 +25,7 @@
     </repositories>
     <profiles>
         <profile>
-            <id>jdk14-jdk15</id>
+            <id>jdk15</id>
             <activation>
                 <jdk>!1.6</jdk>
             </activation>
@@ -49,29 +49,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <excludeDependencies>true</excludeDependencies>
-                    <instructions>
-                        <Bundle-SymbolicName>org.springframework.bundle.ws.support</Bundle-SymbolicName>
-                        <Export-Package>org.springframework.ws*;version="${pom.version}"</Export-Package>
-                        <Import-Package>
-                            org.apache.commons.logging*,
-                            javax.activation*,
-                            javax.jms*,
-                            javax.mail*,
-                            org.springframework.xml*;version="[${pom.version},${pom.version}]",
-                            org.springframework.ws*;version="[${pom.version},${pom.version}]",
-                            org.springframework*;version="[2.0,4.0)",
-                            *;resolution:=optional
-                        </Import-Package>
-                        <Fragment-Host>org.springframework.bundle.ws.core</Fragment-Host>
-                        <Implementation-Title>${pom.name}</Implementation-Title>
-                        <Spring-WS-Version>${pom.version}</Spring-WS-Version>
-                        <Bundle-Vendor>SpringSource</Bundle-Vendor>
-                    </instructions>
-                </configuration>
+                <groupId>com.springsource.bundlor</groupId>
+                <artifactId>com.springsource.bundlor.maven</artifactId>
             </plugin>
         </plugins>
     </build>
diff --git a/support/template.mf b/support/template.mf
new file mode 100644
index 00000000..bd753905
--- /dev/null
+++ b/support/template.mf
@@ -0,0 +1,33 @@
+Bundle-SymbolicName: org.springframework.ws.support
+Bundle-Name: Spring Web Services Support
+Bundle-Vendor: SpringSource
+Bundle-ManifestVersion: 2
+Fragment-Host: org.springframework.ws;bundle-version="[${version}, ${version}]"
+Import-Template: 
+ com.sun.net.httpserver.*;version="0";resolution:=optional,
+ com.sun.mail.imap.*;version="[1.4.0, 2.0.0)";resolution:=optional,
+ javax.activation.*;version="[1.1.0, 2.0.0)",
+ javax.ejb.*;version="[2.0.0, 4.0.0)";resolution:=optional,
+ javax.jms.*;version="[1.1.0, 2.0.0)",
+ javax.mail.*;version="[1.4.0, 2.0.0)",
+ javax.naming.*;version="0";resolution:=optional,
+ javax.net.ssl.*;version="0",
+ javax.xml.transform.*;version="0",
+ org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
+ org.springframework.beans.*;version="[3.0.0, 4.0.0)",
+ org.springframework.context.*;version="[3.0.0, 4.0.0)",
+ org.springframework.core.*;version="[3.0.0, 4.0.0)",
+ org.springframework.ejb.*;version="[3.0.0, 4.0.0)",
+ org.springframework.jms.*;version="[3.0.0, 4.0.0)",
+ org.springframework.jndi.*;version="[3.0.0, 4.0.0)",
+ org.springframework.scheduling.*;version="[3.0.0, 4.0.0)",
+ org.springframework.util.*;version="[3.0.0, 4.0.0)",
+ org.springframework.ws.*;version="[${version}, ${version}]",
+ org.springframework.xml.*;version="[${version}, ${version}]"
+Excluded-Imports:
+ org.springframework.ws.transport.*
+Ignored-Existing-Headers: 
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool