diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/MessageBusParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/MessageBusParser.java
index 8c3a26d419..4683d7560e 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/MessageBusParser.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/MessageBusParser.java
@@ -45,8 +45,10 @@ public class MessageBusParser extends AbstractSimpleBeanDefinitionParser {
 
 	public static final String MESSAGE_BUS_AWARE_POST_PROCESSOR_BEAN_NAME = "internal.MessageBusAwareBeanPostProcessor";
 
+	private static final String TASK_SCHEDULER_ATTRIBUTE = "task-scheduler";
+
 	private static final String CHANNEL_FACTORY_ATTRIBUTE = "channel-factory";
-	
+
 	private static final String INTERCEPTOR_ELEMENT = "interceptor";
 	
 	private static final String REFERENCE_ATTRIBUTE = "ref";
@@ -71,12 +73,14 @@ public class MessageBusParser extends AbstractSimpleBeanDefinitionParser {
 
 	@Override
 	protected boolean isEligibleAttribute(String attributeName) {
-		return !CHANNEL_FACTORY_ATTRIBUTE.equals(attributeName) &&
+		return !TASK_SCHEDULER_ATTRIBUTE.equals(attributeName) &&
+				!CHANNEL_FACTORY_ATTRIBUTE.equals(attributeName) &&
 				super.isEligibleAttribute(attributeName);
 	}
 
 	@Override
 	protected void postProcess(BeanDefinitionBuilder builder, Element element) {
+		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, TASK_SCHEDULER_ATTRIBUTE);
 		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, CHANNEL_FACTORY_ATTRIBUTE);
 		this.processChildElements(builder, element);
 	}
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-core-1.0.xsd b/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-core-1.0.xsd
index 99de95dd76..a8371efc7d 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-core-1.0.xsd
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-core-1.0.xsd
@@ -32,8 +32,8 @@
 				</xsd:element>
 			</xsd:sequence>
 			<xsd:attribute name="auto-startup" type="xsd:boolean"/>
+			<xsd:attribute name="task-scheduler" type="xsd:string"/>
 			<xsd:attribute name="channel-factory" type="xsd:string"/>
-			<xsd:attribute name="dispatcher-pool-size" type="xsd:int"/>
 			<xsd:attribute name="configure-async-event-multicaster" type="xsd:boolean"/>
 		</xsd:complexType>
 	</xsd:element>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java
index 981f7012f0..b84bd59d41 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java
@@ -44,6 +44,7 @@ import org.springframework.integration.channel.config.ChannelParserTests;
 import org.springframework.integration.endpoint.DefaultEndpoint;
 import org.springframework.integration.handler.MessageHandler;
 import org.springframework.integration.handler.TestHandlers;
+import org.springframework.integration.scheduling.TaskScheduler;
 import org.springframework.integration.scheduling.spi.ProviderTaskScheduler;
 
 /**
@@ -186,4 +187,15 @@ public class MessageBusParserTests {
 		MessageBusInterceptorTests.executeInterceptorsTest(messageBus, startInterceptor, stopInterceptor);
 	}
 
+	@Test
+	public void testMessageBusWithTaskScheduler() {
+		ApplicationContext context = new ClassPathXmlApplicationContext(
+				"messageBusWithTaskScheduler.xml", this.getClass());
+		MessageBus messageBus = (MessageBus) context.getBean(MessageBusParser.MESSAGE_BUS_BEAN_NAME);
+		StubTaskScheduler schedulerBean = (StubTaskScheduler) context.getBean("testScheduler");
+		TaskScheduler busScheduler = (TaskScheduler) new DirectFieldAccessor(messageBus).getPropertyValue("taskScheduler");
+		assertNotNull(busScheduler);
+		assertEquals(schedulerBean, busScheduler);
+	}
+
 }
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/StubTaskScheduler.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/StubTaskScheduler.java
new file mode 100644
index 0000000000..e14ed49446
--- /dev/null
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/StubTaskScheduler.java
@@ -0,0 +1,58 @@
+/*
+ * 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.config;
+
+import java.util.concurrent.ScheduledFuture;
+
+import org.springframework.integration.scheduling.SchedulableTask;
+import org.springframework.integration.scheduling.TaskScheduler;
+import org.springframework.integration.util.ErrorHandler;
+
+/**
+ * @author Mark Fisher
+ */
+public class StubTaskScheduler implements TaskScheduler {
+
+	public boolean cancel(Runnable task, boolean mayInterruptIfRunning) {
+		return false;
+	}
+
+	public ScheduledFuture<?> schedule(SchedulableTask task) {
+		return null;
+	}
+
+	public void setErrorHandler(ErrorHandler errorHandler) {
+	}
+
+	public boolean prefersShortLivedTasks() {
+		return false;
+	}
+
+	public void execute(Runnable task) {
+	}
+
+	public boolean isRunning() {
+		return false;
+	}
+
+	public void start() {
+	}
+
+	public void stop() {
+	}
+
+}
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithTaskScheduler.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithTaskScheduler.xml
new file mode 100644
index 0000000000..9f6cee3e01
--- /dev/null
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithTaskScheduler.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
+	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-core-1.0.xsd">
+
+	<message-bus task-scheduler="testScheduler"/>
+
+	<beans:bean id="testScheduler" class="org.springframework.integration.config.StubTaskScheduler"/>
+
+</beans:beans>