diff --git a/core-tiger/src/test/resources/org/springframework/ws/config/swsNamespaceHandlerTest-tiger.xml b/core-tiger/src/test/resources/org/springframework/ws/config/swsNamespaceHandlerTest-tiger.xml
index 3ded1361..b066bec0 100644
--- a/core-tiger/src/test/resources/org/springframework/ws/config/swsNamespaceHandlerTest-tiger.xml
+++ b/core-tiger/src/test/resources/org/springframework/ws/config/swsNamespaceHandlerTest-tiger.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xmlns:tx="http://www.springframework.org/schema/tx"
-        xmlns:sws="http://www.springframework.org/spring-ws/schema/sws" xsi:schemaLocation="
+       xmlns:tx="http://www.springframework.org/schema/tx"
+       xmlns:sws="http://www.springframework.org/spring-ws/schema/sws" xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
        http://www.springframework.org/schema/tx http://www.springframework.org/schema/beans/spring-tx-2.0.xsd
-       http://www.springframework.org/spring-ws/schema/sws http://www.springframework.org/spring-ws/schema/sws/spring-ws-1.1.xsd">
+       http://www.springframework.org/spring-ws/schema/sws http://www.springframework.org/spring-ws/schema/sws/spring-ws-1.5.xsd">
 
     <sws:marshalling-endpoints/>
 
diff --git a/core/src/main/resources/META-INF/spring.schemas b/core/src/main/resources/META-INF/spring.schemas
index b74d61a8..a8713656 100644
--- a/core/src/main/resources/META-INF/spring.schemas
+++ b/core/src/main/resources/META-INF/spring.schemas
@@ -1 +1 @@
-http\://www.springframework.org/spring-ws/schema/sws/spring-ws-1.1.xsd=/org/springframework/ws/config/spring-ws-1.1.xsd
\ No newline at end of file
+http\://www.springframework.org/spring-ws/schema/sws/spring-ws-1.5.xsd=/org/springframework/ws/config/spring-ws-1.5.xsd
\ No newline at end of file
diff --git a/core/src/main/resources/org/springframework/ws/config/spring-ws-1.1.xsd b/core/src/main/resources/org/springframework/ws/config/spring-ws-1.5.xsd
similarity index 85%
rename from core/src/main/resources/org/springframework/ws/config/spring-ws-1.1.xsd
rename to core/src/main/resources/org/springframework/ws/config/spring-ws-1.5.xsd
index 97c23b8d..0e602720 100644
--- a/core/src/main/resources/org/springframework/ws/config/spring-ws-1.1.xsd
+++ b/core/src/main/resources/org/springframework/ws/config/spring-ws-1.5.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <xsd:schema xmlns="http://www.springframework.org/spring-ws/schema/sws" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-        xmlns:beans="http://www.springframework.org/schema/beans"
-        xmlns:tool="http://www.springframework.org/schema/tool"
-        targetNamespace="http://www.springframework.org/spring-ws/schema/sws" elementFormDefault="qualified"
-        attributeFormDefault="unqualified">
+            xmlns:beans="http://www.springframework.org/schema/beans"
+            xmlns:tool="http://www.springframework.org/schema/tool"
+            targetNamespace="http://www.springframework.org/spring-ws/schema/sws" elementFormDefault="qualified"
+            attributeFormDefault="unqualified">
 
     <xsd:import namespace="http://www.springframework.org/schema/beans"/>
     <xsd:import namespace="http://www.springframework.org/schema/tool"/>
@@ -16,7 +16,8 @@
     
     <xsd:element name="marshalling-endpoints">
         <xsd:annotation>
-            <xsd:documentation source="java:org.springframework.ws.server.endpoint.adapter.MarshallingMethodEndpointAdapter">
+            <xsd:documentation
+                    source="java:org.springframework.ws.server.endpoint.adapter.MarshallingMethodEndpointAdapter">
                 Indicates that a unmarshaller should be used to convert incoming request
                 messages into method parameters, and return values marshalled into a response message.
             </xsd:documentation>
@@ -59,7 +60,8 @@
 
     <xsd:element name="xpath-endpoints">
         <xsd:annotation>
-            <xsd:documentation source="java:org.springframework.ws.server.endpoint.adapter.MarshallingMethodEndpointAdapter">
+            <xsd:documentation
+                    source="java:org.springframework.ws.server.endpoint.adapter.MarshallingMethodEndpointAdapter">
                 Indicates that a endpoints using @XPathParam annotations should be detected.
             </xsd:documentation>
         </xsd:annotation>
diff --git a/core/src/test/resources/org/springframework/ws/config/swsNamespaceHandlerTest.xml b/core/src/test/resources/org/springframework/ws/config/swsNamespaceHandlerTest.xml
index 5b710e65..dfe5d128 100644
--- a/core/src/test/resources/org/springframework/ws/config/swsNamespaceHandlerTest.xml
+++ b/core/src/test/resources/org/springframework/ws/config/swsNamespaceHandlerTest.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xmlns:tx="http://www.springframework.org/schema/tx"
-        xmlns:sws="http://www.springframework.org/spring-ws/schema/sws" xsi:schemaLocation="
+       xmlns:tx="http://www.springframework.org/schema/tx"
+       xmlns:sws="http://www.springframework.org/spring-ws/schema/sws" xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
        http://www.springframework.org/schema/tx http://www.springframework.org/schema/beans/spring-tx-2.0.xsd
-       http://www.springframework.org/spring-ws/schema/sws http://www.springframework.org/spring-ws/schema/sws/spring-ws-1.1.xsd">
+       http://www.springframework.org/spring-ws/schema/sws http://www.springframework.org/spring-ws/schema/sws/spring-ws-1.5.xsd">
 
     <sws:marshalling-endpoints/>
 
diff --git a/oxm-tiger/src/test/resources/org/springframework/oxm/config/jaxb2OxmNamespaceHandlerTest.xml b/oxm-tiger/src/test/resources/org/springframework/oxm/config/jaxb2OxmNamespaceHandlerTest.xml
index f2ae361a..4d3ea427 100644
--- a/oxm-tiger/src/test/resources/org/springframework/oxm/config/jaxb2OxmNamespaceHandlerTest.xml
+++ b/oxm-tiger/src/test/resources/org/springframework/oxm/config/jaxb2OxmNamespaceHandlerTest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xmlns:oxm="http://www.springframework.org/spring-ws/schema/oxm" xsi:schemaLocation="
+       xmlns:oxm="http://www.springframework.org/spring-ws/schema/oxm" xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/spring-ws/schema/oxm http://www.springframework.org/spring-ws/schema/oxm/spring-oxm-1.1.xsd">
+       http://www.springframework.org/spring-ws/schema/oxm http://www.springframework.org/spring-ws/schema/oxm/spring-oxm-1.5.xsd">
     <oxm:jaxb2-marshaller id="contextPathMarshaller" contextPath="org.springframework.oxm.jaxb2"/>
     <oxm:jaxb2-marshaller id="classesMarshaller">
         <oxm:class-to-be-bound name="org.springframework.oxm.jaxb2.Flights"/>
diff --git a/oxm/src/main/resources/META-INF/spring.schemas b/oxm/src/main/resources/META-INF/spring.schemas
index b679a948..a1296c8a 100644
--- a/oxm/src/main/resources/META-INF/spring.schemas
+++ b/oxm/src/main/resources/META-INF/spring.schemas
@@ -1 +1 @@
-http\://www.springframework.org/spring-ws/schema/oxm/spring-oxm-1.1.xsd=/org/springframework/oxm/config/spring-oxm-1.1.xsd
\ No newline at end of file
+http\://www.springframework.org/spring-ws/schema/oxm/spring-oxm-1.5.xsd=/org/springframework/oxm/config/spring-oxm-1.5.xsd
\ No newline at end of file
diff --git a/oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-1.1.xsd b/oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-1.5.xsd
similarity index 95%
rename from oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-1.1.xsd
rename to oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-1.5.xsd
index 30feac6e..aef77c27 100644
--- a/oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-1.1.xsd
+++ b/oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-1.5.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <xsd:schema xmlns="http://www.springframework.org/spring-ws/schema/oxm" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-        xmlns:beans="http://www.springframework.org/schema/beans"
-        xmlns:tool="http://www.springframework.org/schema/tool"
-        targetNamespace="http://www.springframework.org/spring-ws/schema/oxm" elementFormDefault="qualified"
-        attributeFormDefault="unqualified">
+            xmlns:beans="http://www.springframework.org/schema/beans"
+            xmlns:tool="http://www.springframework.org/schema/tool"
+            targetNamespace="http://www.springframework.org/spring-ws/schema/oxm" elementFormDefault="qualified"
+            attributeFormDefault="unqualified">
 
     <xsd:import namespace="http://www.springframework.org/schema/beans"/>
     <xsd:import namespace="http://www.springframework.org/schema/tool"/>
diff --git a/oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml b/oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml
index 1355bbd6..c1f3b08e 100644
--- a/oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml
+++ b/oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml
@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:oxm="http://www.springframework.org/spring-ws/schema/oxm" xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/spring-ws/schema/oxm http://www.springframework.org/spring-ws/schema/oxm/spring-oxm-1.1.xsd">
+       http://www.springframework.org/spring-ws/schema/oxm http://www.springframework.org/spring-ws/schema/oxm/spring-oxm-1.5.xsd">
     <oxm:jaxb1-marshaller id="jaxb1Marshaller" contextPath="org.springframework.oxm.jaxb1"/>
     <oxm:jibx-marshaller id="jibxMarshaller" target-class="org.springframework.oxm.jibx.Flights"/>
     <oxm:xmlbeans-marshaller id="xmlBeansMarshaller" options="xmlBeansOptions"/>
diff --git a/src/main/resources/META-INF/spring.schemas b/src/main/resources/META-INF/spring.schemas
index 5be2458a..68f4bc98 100644
--- a/src/main/resources/META-INF/spring.schemas
+++ b/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/spring-ws/schema/oxm/spring-oxm-1.1.xsd=/org/springframework/oxm/config/spring-oxm-1.1.xsd
-http\://www.springframework.org/spring-ws/schema/sws/spring-ws-1.1.xsd=/org/springframework/ws/config/spring-ws-1.1.xsd
\ No newline at end of file
+http\://www.springframework.org/spring-ws/schema/oxm/spring-oxm-1.5.xsd=/org/springframework/oxm/config/spring-oxm-1.5.xsd
+http\://www.springframework.org/spring-ws/schema/sws/spring-ws-1.5.xsd=/org/springframework/ws/config/spring-ws-1.5.xsd
\ No newline at end of file