diff --git a/core-tiger/pom.xml b/core-tiger/pom.xml
index 8b88fa29..af9f6653 100644
--- a/core-tiger/pom.xml
+++ b/core-tiger/pom.xml
@@ -7,6 +7,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-ws-core-tiger</artifactId>
+    <packaging>bundle</packaging>
     <name>Spring WS Core - Java 5</name>
     <build>
         <plugins>
@@ -18,6 +19,37 @@
                     <target>1.5</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>1.0.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.springframework.ws*</Export-Package>
+                        <Import-Package>
+                            org.apache.commons.logging*,
+                            javax.xml.namespace*,
+                            javax.xml.parsers*,
+                            javax.xml.stream*,
+                            javax.xml.transform*,
+                            org.xml.sax*,
+                            org.w3c.dom*,
+                            org.springframework.beans*,
+                            org.springframework.core*,
+                            org.springframework.util*,
+                            org.springframework.oxm*,
+                            org.springframework.ws*,
+                            org.springframework.xml*,
+                            *;resolution:=optional
+                        </Import-Package>
+                        <Implementation-Title>${pom.name}</Implementation-Title>
+                        <Implementation-Version>${pom.version}</Implementation-Version>
+                        <Spring-WS-Version>${pom.version}</Spring-WS-Version>
+                    </instructions>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <dependencies>
diff --git a/core/pom.xml b/core/pom.xml
index 8bbae96f..eb624d8a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-ws-core</artifactId>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
     <name>Spring WS Core</name>
     <description>Spring Web Services Core package.</description>
     <profiles>
@@ -39,6 +39,43 @@
             </dependencies>
         </profile>
     </profiles>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>1.0.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.springframework.ws*</Export-Package>
+                        <Import-Package>
+                            org.apache.commons.logging*,
+                            javax.activation*,
+                            javax.servlet*,
+                            javax.wsdl*,
+                            javax.xml.namespace*,
+                            javax.xml.parsers*,
+                            javax.xml.stream*,
+                            javax.xml.transform*,
+                            org.xml.sax*,
+                            org.w3c.dom*,
+                            org.springframework.beans*,
+                            org.springframework.core*,
+                            org.springframework.util*,
+                            org.springframework.oxm*,
+                            org.springframework.xml*,
+                            *;resolution:=optional
+                        </Import-Package>
+                        <Implementation-Title>${pom.name}</Implementation-Title>
+                        <Implementation-Version>${pom.version}</Implementation-Version>
+                        <Spring-WS-Version>${pom.version}</Spring-WS-Version>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     <dependencies>
         <!-- Spring-WS dependencies -->
         <dependency>
diff --git a/oxm-tiger/pom.xml b/oxm-tiger/pom.xml
index bd32224d..951c6085 100644
--- a/oxm-tiger/pom.xml
+++ b/oxm-tiger/pom.xml
@@ -7,6 +7,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-oxm-tiger</artifactId>
+    <packaging>bundle</packaging>
     <name>Spring O/X Mapping - Java 5</name>
     <build>
         <plugins>
@@ -39,6 +40,36 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>1.0.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.springframework.oxm*</Export-Package>
+                        <Import-Package>
+                            org.apache.commons.logging*,
+                            javax.xml.namespace*,
+                            javax.xml.parsers*,
+                            javax.xml.stream*,
+                            javax.xml.transform*,
+                            org.xml.sax*,
+                            org.w3c.dom*,
+                            org.springframework.beans*,
+                            org.springframework.core*,
+                            org.springframework.util*,
+                            org.springframework.oxm*,
+                            *;resolution:=optional
+                        </Import-Package>
+                        <Implementation-Title>${pom.name}</Implementation-Title>
+                        <Implementation-Version>${pom.version}</Implementation-Version>
+                        <Spring-WS-Version>${pom.version}</Spring-WS-Version>
+                    </instructions>
+                </configuration>
+            </plugin>
+
         </plugins>
     </build>
     <dependencies>
@@ -96,7 +127,7 @@
             <exclusions>
                 <exclusion>
                     <groupId>javax.xml.stream</groupId>
-                    <artifactId>stax-api</artifactId>                    
+                    <artifactId>stax-api</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>javax.activation</groupId>
diff --git a/oxm/pom.xml b/oxm/pom.xml
index 73eea56b..b5c91e4a 100644
--- a/oxm/pom.xml
+++ b/oxm/pom.xml
@@ -7,7 +7,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-oxm</artifactId>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
     <name>Spring O/X Mapping</name>
     <description>Spring Object/XML Mapping abstraction</description>
     <build>
@@ -56,6 +56,35 @@
                     </dependency>
                 </dependencies>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>1.0.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.springframework.oxm*</Export-Package>
+                        <Import-Package>
+                            org.apache.commons.logging*,
+                            javax.xml.namespace*,
+                            javax.xml.parsers*,
+                            javax.xml.stream*,
+                            javax.xml.transform*,
+                            org.xml.sax*,
+                            org.w3c.dom*,
+                            org.springframework.beans*,
+                            org.springframework.core*,
+                            org.springframework.util*,
+                            org.springframework.xml*,
+                            *;resolution:=optional
+                        </Import-Package>
+                        <Implementation-Title>${pom.name}</Implementation-Title>
+                        <Implementation-Version>${pom.version}</Implementation-Version>
+                        <Spring-WS-Version>${pom.version}</Spring-WS-Version>
+                    </instructions>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <dependencies>
@@ -185,6 +214,6 @@
             <artifactId>jettison</artifactId>
             <version>1.0-RC2</version>
             <scope>test</scope>
-        </dependency>        
+        </dependency>
     </dependencies>
 </project>
diff --git a/parent/pom.xml b/parent/pom.xml
index 1c70dd85..1b53bdd2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -33,6 +33,7 @@
     </scm>
     <properties>
         <spring.version>2.0.7</spring.version>
+        <osgi.version>1.5.0.m1</osgi.version>
     </properties>
     <repositories>
         <repository>
@@ -311,7 +312,7 @@
                         <groupId>xerces</groupId>
                         <artifactId>xercesImpl</artifactId>
                     </exclusion>
-                </exclusions>                
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.codehaus.woodstox</groupId>
@@ -542,7 +543,7 @@
                     <exclusion>
                         <groupId>javax.mail</groupId>
                         <artifactId>mail</artifactId>
-                    </exclusion>                    
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -635,7 +636,7 @@
                 <exclusions>
                     <exclusion>
                         <groupId>javax.activation</groupId>
-                        <artifactId>activation</artifactId>                        
+                        <artifactId>activation</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
@@ -683,7 +684,7 @@
             <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
-                <version>1.1</version>
+                <version>1.1.1</version>
                 <exclusions>
                     <exclusion>
                         <groupId>log4j</groupId>
diff --git a/security/pom.xml b/security/pom.xml
index 39d0a2e9..2e06a73e 100644
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -7,7 +7,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-ws-security</artifactId>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
     <name>Spring WS Security</name>
     <description>Spring-WS WS-Security implementation</description>
     <repositories>
@@ -52,6 +52,36 @@
             </dependencies>
         </profile>
     </profiles>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>1.0.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.springframework.ws*</Export-Package>
+                        <Import-Package>
+                            org.apache.commons.logging*,
+                            javax.xml.crypto*,
+                            javax.xml.soap*,
+                            com.sun.xml.wss*,
+                            org.springframework.beans*,
+                            org.springframework.core*,
+                            org.springframework.util*,
+                            org.springframework.ws*,
+                            *;resolution:=optional
+                        </Import-Package>
+                        <Implementation-Title>${pom.name}</Implementation-Title>
+                        <Implementation-Version>${pom.version}</Implementation-Version>
+                        <Spring-WS-Version>${pom.version}</Spring-WS-Version>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     <dependencies>
         <!-- Spring-WS dependencies -->
         <dependency>
@@ -94,7 +124,6 @@
         <dependency>
             <groupId>xml-security</groupId>
             <artifactId>xmlsec</artifactId>
-            <version>1.3.0</version>
         </dependency>
         <dependency>
             <groupId>org.acegisecurity</groupId>
diff --git a/src/main/resources/META-INF/spring.handlers b/src/main/resources/META-INF/spring.handlers
index 1cafc4cf..cb346ee9 100644
--- a/src/main/resources/META-INF/spring.handlers
+++ b/src/main/resources/META-INF/spring.handlers
@@ -1,2 +1,2 @@
 http\://www.springframework.org/spring-ws/schema/oxm=org.springframework.oxm.config.OxmNamespaceHandler
-http\://www.springframework.org/spring-ws/schema/sws=org.springframework.ws.config.SwsNamespaceHandler
\ No newline at end of file
+http\://www.springframework.org/spring-ws/schema/sws=org.springframework.ws.config.WebServicesNamespaceHandler
\ No newline at end of file
diff --git a/support/pom.xml b/support/pom.xml
index cb3f3781..197da59d 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>jar</packaging>
+    <packaging>bundle</packaging>
     <name>Spring WS Support</name>
     <description>Spring Web Services Support package.</description>
     <repositories>
@@ -57,6 +57,36 @@
             </dependencies>
         </profile>
     </profiles>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>1.0.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.springframework.ws*</Export-Package>
+                        <Import-Package>
+                            org.apache.commons.logging*,
+                            javax.activation*,
+                            javax.jms*,
+                            javax.mail*,
+                            org.springframework.beans*,
+                            org.springframework.core*,
+                            org.springframework.util*,
+                            org.springframework.ws.transport*,
+                            *;resolution:=optional
+                        </Import-Package>
+                        <Implementation-Title>${pom.name}</Implementation-Title>
+                        <Implementation-Version>${pom.version}</Implementation-Version>
+                        <Spring-WS-Version>${pom.version}</Spring-WS-Version>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     <dependencies>
         <!-- Spring-WS dependencies -->
         <dependency>
diff --git a/xml/pom.xml b/xml/pom.xml
index ab381488..7e80980b 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -23,6 +23,7 @@
                         <Export-Package>org.springframework.xml*</Export-Package>
                         <Import-Package>
                             org.apache.commons.logging*,
+                            javax.xml.namespace*,
                             javax.xml.parsers*,
                             javax.xml.transform*,
                             org.xml.sax*,