diff --git a/samples/mtom/client/jaxws/src/org/springframework/ws/samples/mtom/client/jaxws/Main.java b/samples/mtom/client/jaxws/src/org/springframework/ws/samples/mtom/client/jaxws/Main.java
index 9e789ffd..f835bc1a 100644
--- a/samples/mtom/client/jaxws/src/org/springframework/ws/samples/mtom/client/jaxws/Main.java
+++ b/samples/mtom/client/jaxws/src/org/springframework/ws/samples/mtom/client/jaxws/Main.java
@@ -38,7 +38,7 @@ public class Main {
         try {
 
             ImageRepositoryService service = new ImageRepositoryService();
-            ImageRepository imageRepository = service.getImageRepositoryPort();
+            ImageRepository imageRepository = service.getImageRepositorySoap11();
             SOAPBinding binding = (SOAPBinding) ((BindingProvider) imageRepository).getBinding();
             binding.setMTOMEnabled(true);
 
diff --git a/samples/mtom/src/main/webapp/WEB-INF/spring-ws-servlet.xml b/samples/mtom/src/main/webapp/WEB-INF/spring-ws-servlet.xml
index 2915d8e5..044d031c 100644
--- a/samples/mtom/src/main/webapp/WEB-INF/spring-ws-servlet.xml
+++ b/samples/mtom/src/main/webapp/WEB-INF/spring-ws-servlet.xml
@@ -7,7 +7,7 @@
     <bean class="org.springframework.ws.samples.mtom.ws.ImageRepositoryEndpoint">
         <constructor-arg ref="imageRepository"/>
     </bean>
-    
+
     <bean class="org.springframework.ws.server.endpoint.mapping.PayloadRootAnnotationMethodEndpointMapping"/>
 
     <bean class="org.springframework.ws.server.endpoint.adapter.GenericMarshallingMethodEndpointAdapter">
@@ -19,14 +19,15 @@
         <property name="mtomEnabled" value="true"/>
     </bean>
 
-    <bean id="mtom" class="org.springframework.ws.wsdl.wsdl11.DynamicWsdl11Definition">
-        <property name="builder">
-            <bean class="org.springframework.ws.wsdl.wsdl11.builder.XsdBasedSoap11Wsdl4jDefinitionBuilder">
-                <property name="schema" value="/WEB-INF/schema.xsd"/>
-                <property name="portTypeName" value="ImageRepository"/>
-                <property name="locationUri" value="http://localhost:8080/mtom/"/>
-            </bean>
-        </property>
+    <bean id="mtom" class="org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition">
+        <property name="schema" ref="schema"/>
+        <property name="portTypeName" value="ImageRepository"/>
+        <property name="locationUri" value="http://localhost:8080/mtom/"/>
+    </bean>
+
+
+    <bean id="schema" class="org.springframework.xml.xsd.SimpleXsdSchema">
+        <property name="xsd" value="/WEB-INF/schema.xsd"/>
     </bean>
 
 </beans>
\ No newline at end of file