diff --git a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/spring-integration-file-1.0.xsd b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/spring-integration-file-1.0.xsd
index 2d2604082f..6ce0902f98 100644
--- a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/spring-integration-file-1.0.xsd
+++ b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/spring-integration-file-1.0.xsd
@@ -33,6 +33,7 @@
 			<xsd:attribute name="directory" type="xsd:string" use="required"/>
 			<xsd:attribute name="filter" type="xsd:string"/>
 			<xsd:attribute name="filename-pattern" type="xsd:string"/>
+			<xsd:attribute name="auto-startup" type="xsd:string" default="true"/>
 		</xsd:complexType>
 	</xsd:element>
 
diff --git a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterParserTests-context.xml b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterParserTests-context.xml
index 982bf5f873..7ca4e28c3f 100644
--- a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterParserTests-context.xml
+++ b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterParserTests-context.xml
@@ -11,7 +11,8 @@
 			http://www.springframework.org/schema/integration/file/spring-integration-file-1.0.xsd">
 
 	<inbound-channel-adapter id="inputDirPoller"
-		directory="file:${java.io.tmpdir}" filter="filter" />
+		directory="file:${java.io.tmpdir}" filter="filter"
+		auto-startup="false"/>
 
 	<beans:bean id="filter" class="org.springframework.integration.file.CompositeFileListFilter">
 		<beans:constructor-arg>