diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/EndpointParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/EndpointParser.java
index e8e3786dd9..a04ad4bc49 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/EndpointParser.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/EndpointParser.java
@@ -78,6 +78,8 @@ public class EndpointParser implements BeanDefinitionParser {
 
 	private static final String PERIOD_ATTRIBUTE = "period";
 
+	private static final String SCHEDULE_ELEMENT = "schedule";
+
 	private static final String SCHEDULE_PROPERTY = "schedule";
 
 	private static final String CONCURRENCY_ELEMENT = "concurrency";
@@ -108,13 +110,16 @@ public class EndpointParser implements BeanDefinitionParser {
 			if (child.getNodeType() == Node.ELEMENT_NODE) {
 				String localName = child.getLocalName();
 				if (CONCURRENCY_ELEMENT.equals(localName)) {
-					parseConcurrencyPolicy((Element) child, subscriptionDef);
+					parseConcurrencyPolicy((Element) child, endpointDef);
 				}
 				else if (HANDLER_ELEMENT.equals(localName)) {
 					String ref = ((Element) child).getAttribute(REF_ATTRIBUTE);
 					String method = ((Element) child).getAttribute(METHOD_ATTRIBUTE);
 					childHandlerRefs.add(this.parseHandlerAdapter(ref, method, parserContext));
 				}
+				else if (SCHEDULE_ELEMENT.equals(localName)) {
+					this.parseSchedule((Element) child, subscriptionDef);
+				}
 			}
 		}
 		String subscriptionBeanName = parserContext.getReaderContext().generateBeanName(subscriptionDef);
@@ -160,7 +165,7 @@ public class EndpointParser implements BeanDefinitionParser {
 		return endpointDef;
 	}
 
-	private void parseConcurrencyPolicy(Element concurrencyElement, RootBeanDefinition subscriptionDefinition) {
+	private void parseConcurrencyPolicy(Element concurrencyElement, RootBeanDefinition endpointDef) {
 		ConcurrencyPolicy policy = new ConcurrencyPolicy();
 		String coreSize = concurrencyElement.getAttribute(CORE_SIZE_ATTRIBUTE);
 		String maxSize = concurrencyElement.getAttribute(MAX_SIZE_ATTRIBUTE);
@@ -170,16 +175,16 @@ public class EndpointParser implements BeanDefinitionParser {
 		if (StringUtils.hasText(maxSize)) {
 			policy.setMaxSize(Integer.parseInt(maxSize));
 		}
-		subscriptionDefinition.getPropertyValues().addPropertyValue(CONCURRENCY_POLICY_PROPERTY, policy);
+		endpointDef.getPropertyValues().addPropertyValue(CONCURRENCY_POLICY_PROPERTY, policy);
 	}
 
-	private void parseSchedule(Element scheduleElement, RootBeanDefinition endpointDefinition) {
+	private void parseSchedule(Element scheduleElement, RootBeanDefinition subscriptionDef) {
 		PollingSchedule schedule = new PollingSchedule(5);
 		String period = scheduleElement.getAttribute(PERIOD_ATTRIBUTE);
 		if (StringUtils.hasText(period)) {
 			schedule.setPeriod(Integer.parseInt(period));
 		}
-		endpointDefinition.getPropertyValues().addPropertyValue(SCHEDULE_PROPERTY, schedule);
+		subscriptionDef.getPropertyValues().addPropertyValue(SCHEDULE_PROPERTY, schedule);
 	}
 
 	private String parseHandlerAdapter(String handlerRef, String handlerMethod, ParserContext parserContext) {
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd b/spring-integration-core/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd
index 6bf2166e9e..73996e8a65 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd
@@ -26,6 +26,7 @@
 			</xsd:annotation>
 			<xsd:attribute name="auto-create-channels" type="xsd:boolean"/>
 			<xsd:attribute name="error-channel" type="xsd:string"/>
+			<xsd:attribute name="dispatcher-pool-size" type="xsd:int"/>
 		</xsd:complexType>
 	</xsd:element>
 
@@ -101,7 +102,7 @@
 				<xsd:extension base="beans:identifiedType">
 					<xsd:sequence>
 						<xsd:element ref="schedule" minOccurs="0" maxOccurs="1"/>
-						<xsd:element ref="concurrency-policy" minOccurs="0" maxOccurs="1"/>
+						<xsd:element ref="concurrency" minOccurs="0" maxOccurs="1"/>
 						<xsd:element ref="handler" minOccurs="0" maxOccurs="unbounded"/>
 					</xsd:sequence>
 					<xsd:attribute name="input-channel" type="xsd:string"/>
@@ -124,7 +125,7 @@
 		</xsd:complexType>
 	</xsd:element>
 
-	<xsd:element name="concurrency-policy">
+	<xsd:element name="concurrency">
 		<xsd:complexType>
 			<xsd:annotation>
 				<xsd:documentation>