diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.0.xsd b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.0.xsd
index 6c64b9b50d..e53d65fb05 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.0.xsd
+++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.0.xsd
@@ -193,6 +193,18 @@
 							</xsd:appinfo>
 						</xsd:annotation>
 					</xsd:attribute>
+					<xsd:attribute name="auto-startup" type="xsd:string" default="true">
+						<xsd:annotation>
+							<xsd:appinfo>
+								<xsd:documentation>
+									Flag to say that the poller should start automatically on startup (default true).
+								</xsd:documentation>
+								<tool:annotation kind="ref">
+									<tool:expected-type type="org.springframework.integration.core.MessageChannel" />
+								</tool:annotation>
+							</xsd:appinfo>
+						</xsd:annotation>
+					</xsd:attribute>
 					<xsd:attribute name="update-sql-parameter-source-factory" type="xsd:string">
 						<xsd:annotation>
 							<xsd:appinfo>
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcPollingChannelAdapterParserTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcPollingChannelAdapterParserTests.java
index 1981f14285..c6a51dcc06 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcPollingChannelAdapterParserTests.java
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcPollingChannelAdapterParserTests.java
@@ -57,6 +57,14 @@ public class JdbcPollingChannelAdapterParserTests {
 
 	private PlatformTransactionManager transactionManager;
 
+	@Test
+	public void testNoAutoStartupInboundChannelAdapter() {
+		setUp("pollingNoAutoStartupJdbcInboundChannelAdapterTest.xml", getClass());
+		this.jdbcTemplate.update("insert into item values(1,'',2)");
+		Message<?> message = messagingTemplate.receive();
+		assertNull("Message found ", message);
+	}
+
 	@Test
 	public void testSimpleInboundChannelAdapter() {
 		setUp("pollingForMapJdbcInboundChannelAdapterTest.xml", getClass());
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingNoAutoStartupJdbcInboundChannelAdapterTest.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingNoAutoStartupJdbcInboundChannelAdapterTest.xml
new file mode 100644
index 0000000000..0a123f1d50
--- /dev/null
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingNoAutoStartupJdbcInboundChannelAdapterTest.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/integration/jdbc"
+	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/integration/jdbc
+			http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd">
+	
+	<inbound-channel-adapter id="jdbcAdapter" query="select * from item where status=2" channel="target" 
+			data-source="dataSource" auto-startup="#{systemProperties['autostart']?:false}"/>
+		
+	<beans:import  resource="jdbcInboundChannelAdapterCommonConfig.xml" />
+
+</beans:beans>