diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml
index 883a77382d..90e1bdda73 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml
@@ -3,12 +3,15 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xmlns:stream="http://www.springframework.org/schema/integration/stream"
+	xmlns:ws="http://www.springframework.org/schema/integration/ws"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-ws-1.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
 			http://www.springframework.org/schema/integration/stream
-			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
+			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd
+			http://www.springframework.org/schema/integration/ws
+			http://www.springframework.org/schema/integration/ws/spring-integration-ws-1.0.xsd">
 
 	<message-bus/>
 
@@ -16,7 +19,7 @@
 
 	<!-- The service activator receives from the 'fahrenheitChannel', invokes the
 	     Web Service for the given URI, and sends the reply Message to the 'celsiusChannel'. -->
-	<ws-service-activator id="temperatureConverter"
+	<ws:ws-service-activator id="temperatureConverter"
 				          input-channel="fahrenheitChannel" 
 				          output-channel="celsiusChannel"
 				          uri="http://www.w3schools.com/webservices/tempconvert.asmx"/>
diff --git a/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/WsNamespaceHandler.java b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/WsNamespaceHandler.java
new file mode 100644
index 0000000000..103e940e57
--- /dev/null
+++ b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/WsNamespaceHandler.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2002-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.ws.config;
+
+import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+
+/**
+ * @author Mark Fisher
+ */
+public class WsNamespaceHandler extends NamespaceHandlerSupport {
+
+	public void init() {
+		this.registerBeanDefinitionParser("ws-service-activator", new WebServiceHandlerParser());
+	}
+
+}
diff --git a/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/spring-integration-ws-1.0.xsd b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/spring-integration-ws-1.0.xsd
index 19dd0925f9..6b448d67c7 100644
--- a/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/spring-integration-ws-1.0.xsd
+++ b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/spring-integration-ws-1.0.xsd
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.springframework.org/schema/integration"
+<xsd:schema xmlns="http://www.springframework.org/schema/integration/ws"
 		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/schema/integration"
+		targetNamespace="http://www.springframework.org/schema/integration/ws"
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	<xsd:include schemaLocation="http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd"/>
-	<xsd:include schemaLocation="http://www.springframework.org/schema/integration/spring-integration-adapters-1.0.xsd"/>
-
 	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
 
diff --git a/org.springframework.integration.ws/src/main/resources/META-INF/spring-integration.parsers b/org.springframework.integration.ws/src/main/resources/META-INF/spring-integration.parsers
deleted file mode 100644
index a7b5c85138..0000000000
--- a/org.springframework.integration.ws/src/main/resources/META-INF/spring-integration.parsers
+++ /dev/null
@@ -1 +0,0 @@
-ws-service-activator=org.springframework.integration.ws.config.WebServiceHandlerParser
\ No newline at end of file
diff --git a/org.springframework.integration.ws/src/main/resources/META-INF/spring.handlers b/org.springframework.integration.ws/src/main/resources/META-INF/spring.handlers
new file mode 100644
index 0000000000..0710888f12
--- /dev/null
+++ b/org.springframework.integration.ws/src/main/resources/META-INF/spring.handlers
@@ -0,0 +1 @@
+http\://www.springframework.org/schema/integration/ws=org.springframework.integration.ws.config.WsNamespaceHandler
\ No newline at end of file
diff --git a/org.springframework.integration.ws/src/main/resources/META-INF/spring.schemas b/org.springframework.integration.ws/src/main/resources/META-INF/spring.schemas
index fbb973f44f..58efe84c83 100644
--- a/org.springframework.integration.ws/src/main/resources/META-INF/spring.schemas
+++ b/org.springframework.integration.ws/src/main/resources/META-INF/spring.schemas
@@ -1 +1 @@
-http\://www.springframework.org/schema/integration/spring-integration-ws-1.0.xsd=org/springframework/integration/ws/config/spring-integration-ws-1.0.xsd
+http\://www.springframework.org/schema/integration/ws/spring-integration-ws-1.0.xsd=org/springframework/integration/ws/config/spring-integration-ws-1.0.xsd
diff --git a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/marshallingWebServiceHandlerParserTests.xml b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/marshallingWebServiceHandlerParserTests.xml
index 85abac8b86..38a40ae3c3 100644
--- a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/marshallingWebServiceHandlerParserTests.xml
+++ b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/marshallingWebServiceHandlerParserTests.xml
@@ -2,37 +2,40 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:si="http://www.springframework.org/schema/integration"
+	xmlns:ws="http://www.springframework.org/schema/integration/ws"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-ws-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/ws
+			http://www.springframework.org/schema/integration/ws/spring-integration-ws-1.0.xsd">
 
 	<si:channel id="inputChannel"/>
 
-	<si:ws-service-activator id="handlerWithAllInOneMarshaller"
+	<ws:ws-service-activator id="handlerWithAllInOneMarshaller"
 	                         input-channel="inputChannel"
 	                         uri="http://example.org"
 	                         marshaller="marshallerAndUnmarshaller"/>
 
-	<si:ws-service-activator id="handlerWithSeparateMarshallerAndUnmarshaller"
+	<ws:ws-service-activator id="handlerWithSeparateMarshallerAndUnmarshaller"
 	                         input-channel="inputChannel"
 	                         uri="http://example.org"
 	                         marshaller="marshaller"
 	                         unmarshaller="unmarshaller"/>
 
-	<si:ws-service-activator id="handlerWithCustomRequestCallback"
+	<ws:ws-service-activator id="handlerWithCustomRequestCallback"
 	                         input-channel="inputChannel"
 	                         uri="http://example.org"
 	                         marshaller="marshallerAndUnmarshaller"
 	                         request-callback="requestCallback"/>
 
-	<si:ws-service-activator id="handlerWithAllInOneMarshallerAndMessageFactory"
+	<ws:ws-service-activator id="handlerWithAllInOneMarshallerAndMessageFactory"
 	                         input-channel="inputChannel"
 	                         uri="http://example.org"
 	                         marshaller="marshallerAndUnmarshaller"
 	                         message-factory="messageFactory"/>
 
-	<si:ws-service-activator id="handlerWithSeparateMarshallerAndUnmarshallerAndMessageFactory"
+	<ws:ws-service-activator id="handlerWithSeparateMarshallerAndUnmarshallerAndMessageFactory"
 	                         input-channel="inputChannel"
 	                         uri="http://example.org"
 	                         marshaller="marshaller"
diff --git a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceHandlerParserTests.xml b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceHandlerParserTests.xml
index ea5d634970..3afe666a53 100644
--- a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceHandlerParserTests.xml
+++ b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceHandlerParserTests.xml
@@ -2,39 +2,42 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:si="http://www.springframework.org/schema/integration"
+	xmlns:ws="http://www.springframework.org/schema/integration/ws"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-ws-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/ws
+			http://www.springframework.org/schema/integration/ws/spring-integration-ws-1.0.xsd">
 
 	<si:channel id="inputChannel"/>
 
-	<si:ws-service-activator id="handlerWithDefaultSourceExtractor"
+	<ws:ws-service-activator id="handlerWithDefaultSourceExtractor"
 		                     input-channel="inputChannel"
 	                         uri="http://example.org"/>
 
-	<si:ws-service-activator id="handlerWithCustomSourceExtractor"
+	<ws:ws-service-activator id="handlerWithCustomSourceExtractor"
 	                         input-channel="inputChannel"
 	                         uri="http://example.org"
 	                         source-extractor="sourceExtractor"/>
 
-	<si:ws-service-activator id="handlerWithCustomRequestCallback"
+	<ws:ws-service-activator id="handlerWithCustomRequestCallback"
 	                         input-channel="inputChannel"
 	                         uri="http://example.org"
 	                         request-callback="requestCallback"/>
 
-	<si:ws-service-activator id="handlerWithCustomMessageFactory"
+	<ws:ws-service-activator id="handlerWithCustomMessageFactory"
 	                         input-channel="inputChannel"
 	                         uri="http://example.org"
 	                         message-factory="messageFactory"/>
 
-	<si:ws-service-activator id="handlerWithCustomSourceExtractorAndMessageFactory"
+	<ws:ws-service-activator id="handlerWithCustomSourceExtractorAndMessageFactory"
 	                         input-channel="inputChannel"
 	                         uri="http://example.org"
 	                         source-extractor="sourceExtractor"
 	                         message-factory="messageFactory"/>
 
-	<si:ws-service-activator id="handlerWithCustomFaultMessageResolver"
+	<ws:ws-service-activator id="handlerWithCustomFaultMessageResolver"
 	                         input-channel="inputChannel"
 	                         uri="http://example.org"
 	                         fault-message-resolver="faultMessageResolver"/>