diff --git a/spring-integration-sftp/.springBeans b/spring-integration-sftp/.springBeans
index b406aa32ac..ab7a2a4581 100644
--- a/spring-integration-sftp/.springBeans
+++ b/spring-integration-sftp/.springBeans
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beansProjectDescription>
 	<version>1</version>
-	<pluginVersion><![CDATA[2.5.2.201101121000-SR1]]></pluginVersion>
+	<pluginVersion><![CDATA[2.6.0.201104111100-PATCH]]></pluginVersion>
 	<configSuffixes>
 		<configSuffix><![CDATA[xml]]></configSuffix>
 	</configSuffixes>
 	<enableImports><![CDATA[false]]></enableImports>
 	<configs>
 		<config>src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapterParserTests-context.xml</config>
+		<config>src/test/java/org/springframework/integration/sftp/config/SftpInboundAutostartup-context.xml</config>
 	</configs>
 	<configSets>
 	</configSets>
diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserTests.java
index 3c39393563..3744f9f97a 100644
--- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserTests.java
+++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserTests.java
@@ -48,6 +48,15 @@ public class InboundChannelAdapterParserTests {
 	public void prepare(){
 		new File("foo").delete();
 	}
+	
+	@Test
+	public void testAutoStartup() throws Exception{
+		ApplicationContext context =
+			new ClassPathXmlApplicationContext("SftpInboundAutostartup-context.xml", this.getClass());
+		
+		SourcePollingChannelAdapter adapter = context.getBean("sftpAutoStartup", SourcePollingChannelAdapter.class);
+		assertFalse(adapter.isRunning());
+	}
 
 	@SuppressWarnings("unchecked")
 	@Test
diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpInboundAutostartup-context.xml b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpInboundAutostartup-context.xml
new file mode 100644
index 0000000000..9705275aaa
--- /dev/null
+++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpInboundAutostartup-context.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:int="http://www.springframework.org/schema/integration"
+	xmlns:int-sftp="http://www.springframework.org/schema/integration/sftp"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/sftp http://www.springframework.org/schema/integration/sftp/spring-integration-sftp-2.0.xsd">
+
+	<bean id="sftpSessionFactory" class="org.springframework.integration.sftp.session.DefaultSftpSessionFactory">
+		<property name="host" value="loclahost"/>
+		<property name="knownHosts" value="local, foo.com, bar.foo"/>
+		<property name="privateKey" value="classpath:org/springframework/integration/sftp/config/sftpTest"/>
+		<property name="privateKeyPassphrase" value="ghj"/>
+		<property name="password" value="hello"/>
+		<property name="port" value="2222"/>
+		<property name="user" value="oleg"/>
+	</bean>
+	
+	<int:channel id="requestChannel">
+		<int:queue/>
+	</int:channel>
+	
+	<int-sftp:inbound-channel-adapter id="sftpAutoStartup"
+			session-factory="sftpSessionFactory"
+			channel="requestChannel"
+			filename-regex="f[o]+\.txt"
+			remote-directory="/foo"
+			local-directory="file:local-test-dir"
+			auto-create-local-directory="false"
+			remote-file-separator="."
+			temporary-file-suffix=".bar"
+			delete-remote-files="false"
+			auto-startup="false">
+		<int:poller fixed-rate="1000"/>
+	</int-sftp:inbound-channel-adapter>
+
+</beans>