diff --git a/activemq-karaf/src/main/resources/features.xml b/activemq-karaf/src/main/resources/features.xml
index 8ae4c2de9c..bff5b70797 100644
--- a/activemq-karaf/src/main/resources/features.xml
+++ b/activemq-karaf/src/main/resources/features.xml
@@ -64,6 +64,7 @@
 
     <feature name="activemq-optional" version="${activemq-version}" resolver="(obr)">
         <feature version="${activemq-version}">activemq-blueprint</feature>
+        <feature version="${activemq-version}">activemq-spring</feature>
         <feature version="[7.5,8.0)">jetty</feature>
         <bundle>mvn:org.apache.activemq/activemq-optional/${activemq-version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.josql/${josql-version}</bundle>
@@ -73,6 +74,7 @@
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans-bundle-version}</bundle>
         <bundle>mvn:org.apache.httpcomponents/httpcore-osgi/${httpclient-version}</bundle>
         <bundle>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient-version}</bundle>
+        <bundle>mvn:org.springframework/spring-oxm/${spring-version}</bundle>
     </feature>
 
     <feature name="activemq-camel" version="${activemq-version}" resolver="(obr)">
diff --git a/activemq-optional/pom.xml b/activemq-optional/pom.xml
index 65359225ff..ef7f7c96a4 100755
--- a/activemq-optional/pom.xml
+++ b/activemq-optional/pom.xml
@@ -162,9 +162,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-        <groupId>org.springframework.ws</groupId>
-        <artifactId>spring-oxm-tiger</artifactId>
-        <optional>true</optional>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-oxm</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.xbean</groupId>
diff --git a/activemq-optional/src/main/java/org/apache/activemq/util/oxm/OXMMessageTransformer.java b/activemq-optional/src/main/java/org/apache/activemq/util/oxm/OXMMessageTransformer.java
index 8447851b59..a82241b4c6 100644
--- a/activemq-optional/src/main/java/org/apache/activemq/util/oxm/OXMMessageTransformer.java
+++ b/activemq-optional/src/main/java/org/apache/activemq/util/oxm/OXMMessageTransformer.java
@@ -17,17 +17,22 @@
 
 package org.apache.activemq.util.oxm;
 
+import java.io.StringReader;
+import java.io.StringWriter;
 import javax.jms.JMSException;
 import javax.jms.ObjectMessage;
 import javax.jms.Session;
 import javax.jms.TextMessage;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.springframework.oxm.support.AbstractMarshaller;
 
-import org.springframework.oxm.AbstractMarshaller;
-import org.springframework.xml.transform.StringResult;
-import org.springframework.xml.transform.StringSource;
 
 /**
- * Transforms object messages to text messages and vice versa using {@link Spring OXM}
+ * Transforms object messages to text messages and vice versa using Spring OXM.
  *
  */
 public class OXMMessageTransformer extends AbstractXMLMessageTransformer {
@@ -51,10 +56,12 @@ public class OXMMessageTransformer extends AbstractXMLMessageTransformer {
      */
 	protected String marshall(Session session, ObjectMessage objectMessage)
 			throws JMSException {
-		StringResult result = new StringResult();
 		try {
-			marshaller.marshal(objectMessage.getObject(), result);
-			return result.toString();
+            StringWriter writer = new StringWriter();
+            Result result = new StreamResult(writer);
+            marshaller.marshal(objectMessage.getObject(), result);
+            writer.flush();
+			return writer.toString();
 		} catch (Exception e) {
 			throw new JMSException(e.getMessage());
 		}
@@ -67,7 +74,9 @@ public class OXMMessageTransformer extends AbstractXMLMessageTransformer {
 	protected Object unmarshall(Session session, TextMessage textMessage)
 			throws JMSException {
 		try {
-			return marshaller.unmarshal(new StringSource(textMessage.getText()));
+            String text = textMessage.getText();
+            Source source = new StreamSource(new StringReader(text));
+			return marshaller.unmarshal(source);
 		} catch (Exception e) {
 			throw new JMSException(e.getMessage());
 		}
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 9bbf20c348..b956b88c07 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -230,8 +230,8 @@
       <optional>false</optional>
     </dependency>
     <dependency>
-        <groupId>org.springframework.ws</groupId>
-        <artifactId>spring-oxm-tiger</artifactId>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-oxm</artifactId>
     </dependency>
     <dependency>
       <groupId>org.codehaus.jettison</groupId>
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index 5abb3215ed..a036554954 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -152,18 +152,18 @@
         <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
         <include>org.apache.xbean:xbean-spring</include>
         <include>org.springframework:spring-aop</include>
-        <include>org.springframework:spring-core</include>
+        <include>org.springframework:spring-asm</include>
         <include>org.springframework:spring-beans</include>
         <include>org.springframework:spring-context</include>
-        <include>org.springframework:spring-tx</include>
-        <include>org.springframework:spring-jms</include>
-        <include>org.springframework:spring-asm</include>
+        <include>org.springframework:spring-core</include>
         <include>org.springframework:spring-expression</include>
+        <include>org.springframework:spring-jms</include>
+        <include>org.springframework:spring-oxm</include>
+        <include>org.springframework:spring-tx</include>
         <include>com.thoughtworks.xstream:xstream</include>
         <include>xpp3:xpp3</include>
         <include>org.codehaus.woodstox:woodstox-core-asl</include>
         <include>org.codehaus.woodstox:stax2-api</include>
-        <include>org.springframework.ws:spring-oxm-tiger</include>
         <include>org.codehaus.jettison:jettison</include>
         <include>org.apache.velocity:velocity</include>
         <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.josql</include>
diff --git a/pom.xml b/pom.xml
index bf30479675..b72b07ddad 100755
--- a/pom.xml
+++ b/pom.xml
@@ -641,9 +641,9 @@
         <version>${spring-version}</version>
       </dependency>
       <dependency>
-        <groupId>org.springframework.ws</groupId>
-        <artifactId>spring-oxm-tiger</artifactId>
-        <version>${spring-oxm-version}</version>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-oxm</artifactId>
+        <version>${spring-version}</version>
       </dependency>
       <dependency>
           <groupId>org.springframework.osgi</groupId>