diff --git a/samples/tutorial/src/main/webapp/WEB-INF/spring-ws-servlet.xml b/samples/tutorial/src/main/webapp/WEB-INF/spring-ws-servlet.xml
index ae6fdb99..f16e2228 100644
--- a/samples/tutorial/src/main/webapp/WEB-INF/spring-ws-servlet.xml
+++ b/samples/tutorial/src/main/webapp/WEB-INF/spring-ws-servlet.xml
@@ -38,7 +38,8 @@
     <bean id="holiday" class="org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition">
         <property name="schema" ref="schema"/>
         <property name="portTypeName" value="HumanResource"/>
-        <property name="locationUri" value="http://localhost:8080/holidayService/"/>
+        <!-- we use a relative uri that will be transformed by spring-ws dep-->
+        <property name="locationUri" value="/holidayService/"/>
         <property name="targetNamespace" value="http://mycompany.com/hr/definitions"/>
     </bean>
 
@@ -46,4 +47,4 @@
         <property name="xsd" value="/WEB-INF/hr.xsd"/>
     </bean>
 
-</beans>
\ No newline at end of file
+</beans>
diff --git a/samples/tutorial/src/main/webapp/WEB-INF/web.xml b/samples/tutorial/src/main/webapp/WEB-INF/web.xml
index 68288e8a..408aa8d1 100644
--- a/samples/tutorial/src/main/webapp/WEB-INF/web.xml
+++ b/samples/tutorial/src/main/webapp/WEB-INF/web.xml
@@ -24,6 +24,10 @@
     <servlet>
         <servlet-name>spring-ws</servlet-name>
         <servlet-class>org.springframework.ws.transport.http.MessageDispatcherServlet</servlet-class>
+        <init-param>
+            <param-name>transformWsdlLocations</param-name>
+            <param-value>true</param-value>
+        </init-param>
     </servlet>
 
     <servlet-mapping>
diff --git a/src/docbkx/server.xml b/src/docbkx/server.xml
index 7f95641e..9e48f0d2 100644
--- a/src/docbkx/server.xml
+++ b/src/docbkx/server.xml
@@ -151,7 +151,7 @@
                 that means that it looks for '<filename>/WEB-INF/spring-ws-servlet.xml</filename>'. This file will
                 contain all of the SWS-specific beans such as endpoints, marshallers and suchlike.
             </para>
-            <section>
+            <section id="server-automatic-wsdl-exposure">
                 <title>Automatic WSDL exposure</title>
                 <para>
                     The <classname>MessageDispatcherServlet</classname> will automatically detect any
diff --git a/src/docbkx/tutorial.xml b/src/docbkx/tutorial.xml
index 8fc534df..2efa4108 100644
--- a/src/docbkx/tutorial.xml
+++ b/src/docbkx/tutorial.xml
@@ -725,7 +725,7 @@ public class HolidayEndpoint extends AbstractJDomPayloadEndpoint {
             <programlisting><![CDATA[<bean id="holiday" class="org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition">
     <property name="schema" ref="schema"/>
     <property name="portTypeName" value="HumanResource"/>
-    <property name="locationUri" value="http://localhost:8080/holidayService/"/>
+    <property name="locationUri" value="/holidayService/"/>
     <property name="targetNamespace" value="http://mycompany.com/hr/definitions"/>
 </bean>
 
@@ -756,10 +756,9 @@ public class HolidayEndpoint extends AbstractJDomPayloadEndpoint {
                 <callout arearefs="tutorial.wsdl.gen.locationUri">
                     <para>
                         We set the location where the service can be reached:
-                        <uri>http://localhost:8080/holidayService</uri>. For development, this will suffice, but
-                        obviously we need to change this to <uri>http://mycompany.com/humanresources</uri> when going
-                        live. A common way to to accomplish this is to use a Spring
-                        <classname>PropertyPlaceholderConfigurer</classname>.
+                        <uri>/holidayService/</uri>. We use a a relative URI and we instruct the framework to transform it
+                        dynamically to an absolute URI. Hence, if the service is deployed to different contexts we don't have
+                        to change the URI manually. For more information, please refer to <xref linkend="server-automatic-wsdl-exposure"/>
                     </para>
                 </callout>
                 <callout arearefs="tutorial.wsdl.gen.tns">