diff --git a/samples/airline/client/jms/build.xml b/samples/airline/client/jms/build.xml
index 5dd4ae4f..657f3094 100644
--- a/samples/airline/client/jms/build.xml
+++ b/samples/airline/client/jms/build.xml
@@ -23,7 +23,7 @@
             <remoteRepository refid="spring-ext"/>
             <dependency groupId="javax.xml.soap" artifactId="saaj-api" version="1.3"/>
             <dependency groupId="org.apache.activemq" artifactId="activemq-core" version="4.1.1"/>
-            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="1.5.9"/>
+            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="2.0.0-M1"/>
         </artifact:dependencies>
 
         <artifact:dependencies pathId="runtime.classpath">
@@ -31,7 +31,7 @@
             <remoteRepository refid="java.net"/>
             <remoteRepository refid="spring-ext"/>
             <dependency groupId="com.sun.xml.messaging.saaj" artifactId="saaj-impl" version="1.3"/>
-            <dependency groupId="org.springframework.ws" artifactId="spring-ws-support" version="1.5.9"/>
+            <dependency groupId="org.springframework.ws" artifactId="spring-ws-support" version="2.0.0-M1"/>
             <dependency groupId="org.springframework" artifactId="spring-jms" version="2.5.1"/>
         </artifact:dependencies>
 
diff --git a/samples/airline/client/spring-ws/build.xml b/samples/airline/client/spring-ws/build.xml
index 90974e7f..d2cec7b1 100644
--- a/samples/airline/client/spring-ws/build.xml
+++ b/samples/airline/client/spring-ws/build.xml
@@ -19,8 +19,8 @@
         <artifact:dependencies pathId="classpath">
             <remoteRepository refid="main"/>
             <remoteRepository refid="java.net"/>
-            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="1.5.9"/>
-            <dependency groupId="org.springframework.ws" artifactId="spring-ws-security" version="1.5.9"/>
+            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="2.0.0-M1"/>
+            <dependency groupId="org.springframework.ws" artifactId="spring-ws-security" version="2.0.0-M1"/>
             <dependency groupId="com.sun.xml.messaging.saaj" artifactId="saaj-impl" version="1.3"/>
             <dependency groupId="commons-httpclient" artifactId="commons-httpclient" version="3.0.1"/>
             <dependency groupId="xmlbeans" artifactId="xbean" version="2.2.0"/>
diff --git a/samples/echo/client/spring-ws/build.xml b/samples/echo/client/spring-ws/build.xml
index 61d09a29..91ed2e40 100644
--- a/samples/echo/client/spring-ws/build.xml
+++ b/samples/echo/client/spring-ws/build.xml
@@ -11,7 +11,7 @@
         </typedef>
 
         <artifact:dependencies pathId="classpath">
-            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="1.5.9"/>
+            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="2.0.0-M1"/>
             <dependency groupId="com.sun.xml.messaging.saaj" artifactId="saaj-impl" version="1.3"/>
             <dependency groupId="commons-httpclient" artifactId="commons-httpclient" version="3.0.1"/>
         </artifact:dependencies>
diff --git a/samples/mtom/client/spring-ws/build.xml b/samples/mtom/client/spring-ws/build.xml
index 7bb94158..e7a9e952 100644
--- a/samples/mtom/client/spring-ws/build.xml
+++ b/samples/mtom/client/spring-ws/build.xml
@@ -29,7 +29,7 @@
             <remoteRepository refid="main"/>
             <remoteRepository refid="java.net"/>
             <dependency groupId="org.springframework" artifactId="spring-core" version="2.5.6"/>
-            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="1.5.9"/>
+            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="2.0.0-M1"/>
             <dependency groupId="org.apache.ws.commons.axiom" artifactId="axiom-api" version="1.2.8"/>
             <dependency groupId="org.apache.ws.commons.axiom" artifactId="axiom-impl" version="1.2.8"/>
         </artifact:dependencies>
@@ -37,9 +37,9 @@
         <artifact:dependencies pathId="runtime.classpath">
             <remoteRepository refid="main"/>
             <remoteRepository refid="java.net"/>
-            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="1.5.9"/>
-            <dependency groupId="org.springframework.ws" artifactId="spring-oxm" version="1.5.9"/>
-            <dependency groupId="org.springframework.ws" artifactId="spring-oxm-tiger" version="1.5.9"/>
+            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="2.0.0-M1"/>
+            <dependency groupId="org.springframework.ws" artifactId="spring-oxm" version="2.0.0-M1"/>
+            <dependency groupId="org.springframework.ws" artifactId="spring-oxm-tiger" version="2.0.0-M1"/>
             <dependency groupId="com.sun.xml.ws" artifactId="jaxws-rt" version="EA3"/>
             <dependency groupId="com.sun.xml.bind" artifactId="jaxb-impl" version="2.1-EA2"/>
             <dependency groupId="com.sun.xml.messaging.saaj" artifactId="saaj-impl" version="1.3"/>
diff --git a/samples/mtom/pom.xml b/samples/mtom/pom.xml
index d21325cc..3641f398 100644
--- a/samples/mtom/pom.xml
+++ b/samples/mtom/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <artifactId>spring-ws-samples</artifactId>
       <groupId>org.springframework.ws</groupId>
-      <version>1.5.10-SNAPSHOT</version>
+      <version>2.0.0-M1-SNAPSHOT</version>
       <relativePath>../samples/pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
diff --git a/samples/pox/client/spring-ws/build.xml b/samples/pox/client/spring-ws/build.xml
index c82b1451..11831009 100644
--- a/samples/pox/client/spring-ws/build.xml
+++ b/samples/pox/client/spring-ws/build.xml
@@ -11,7 +11,7 @@
         </typedef>
 
         <artifact:dependencies pathId="classpath">
-            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="1.5.9"/>
+            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="2.0.0-M1"/>
             <dependency groupId="log4j" artifactId="log4j" version="1.2.13"/>
         </artifact:dependencies>
 
diff --git a/samples/stockquote/client/spring-ws/build.xml b/samples/stockquote/client/spring-ws/build.xml
index 325ced33..817c0140 100644
--- a/samples/stockquote/client/spring-ws/build.xml
+++ b/samples/stockquote/client/spring-ws/build.xml
@@ -11,7 +11,7 @@
         </typedef>
 
         <artifact:dependencies pathId="classpath">
-            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="1.5.9"/>
+            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="2.0.0-M1"/>
             <dependency groupId="com.sun.xml.messaging.saaj" artifactId="saaj-impl" version="1.3"/>
             <dependency groupId="log4j" artifactId="log4j" version="1.2.13"/>
         </artifact:dependencies>
diff --git a/src/docbkx/tutorial.xml b/src/docbkx/tutorial.xml
index 12c9ae9e..c307cca5 100644
--- a/src/docbkx/tutorial.xml
+++ b/src/docbkx/tutorial.xml
@@ -474,7 +474,7 @@
         </para>
 <screen>mvn archetype:create -DarchetypeGroupId=org.springframework.ws \
   -DarchetypeArtifactId=spring-ws-archetype \
-  -DarchetypeVersion=1.5.9 \
+  -DarchetypeVersion=2.0.0-M1 \
   -DgroupId=com.mycompany.hr \
   -DartifactId=holidayService
 </screen>
@@ -634,7 +634,7 @@ public class HolidayEndpoint extends AbstractJDomPayloadEndpoint {
     <dependency>
         <groupId>org.springframework.ws</groupId>
         <artifactId>spring-ws-core</artifactId>
-        <version>1.5.9</version>
+        <version>2.0.0-M1</version>
     </dependency>
     <dependency>
         <groupId>jdom</groupId>