diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/spring-integration-1.0.xsd b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/spring-integration-1.0.xsd
index 50c9a19a8d..565fe68850 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/spring-integration-1.0.xsd
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/spring-integration-1.0.xsd
@@ -840,9 +840,51 @@
 		<xsd:complexType>
 			<xsd:complexContent>
 				<xsd:extension base="inputEndpointType">
-					<xsd:sequence>
-						<xsd:element name="mapping" type="mappingType"
-							minOccurs="0" maxOccurs="unbounded">
+					<xsd:sequence>	
+						<xsd:element name="mapping" minOccurs="0" maxOccurs="unbounded">
+							<xsd:complexType>
+								<xsd:attribute name="value" type="xsd:string"/>
+								<xsd:attribute name="channel" type="xsd:string"/>
+							</xsd:complexType>	
+						</xsd:element>
+					</xsd:sequence>
+					<xsd:attribute name="default-output-channel"
+						type="xsd:string">
+						<xsd:annotation>
+							<xsd:appinfo>
+								<tool:annotation kind="ref">
+									<tool:expected-type
+										type="org.springframework.integration.core.MessageChannel" />
+								</tool:annotation>
+							</xsd:appinfo>
+						</xsd:annotation>
+					</xsd:attribute>
+					<xsd:attribute name="resolution-required"
+						type="xsd:boolean" />
+					<xsd:attribute
+						name="ignore-channel-name-resolution-failures" type="xsd:boolean" />
+					<xsd:attribute name="header-name"
+						type="xsd:string">
+					</xsd:attribute>
+				</xsd:extension>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+	<xsd:element name="payload-type-router">
+		<xsd:annotation>
+			<xsd:documentation>
+				Defines a Header Value Router.
+			</xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:extension base="inputEndpointType">
+					<xsd:sequence>	
+						<xsd:element name="mapping" minOccurs="1" maxOccurs="unbounded">
+							<xsd:complexType>
+								<xsd:attribute name="type" type="xsd:string"/>
+								<xsd:attribute name="channel" type="xsd:string"/>
+							</xsd:complexType>	
 						</xsd:element>
 					</xsd:sequence>
 					<xsd:attribute name="default-output-channel"
@@ -1137,10 +1179,4 @@
 			</xsd:annotation>
 		</xsd:attribute>
 	</xsd:complexType>
-
-
-	<xsd:complexType name="mappingType">
-		<xsd:attribute name="value" type="xsd:string"></xsd:attribute>
-		<xsd:attribute name="channel" type="xsd:string"></xsd:attribute>
-	</xsd:complexType>
 </xsd:schema>
\ No newline at end of file