diff --git a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.0.xsd b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.0.xsd
index 2389e4be23..7d6bcbe6de 100644
--- a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.0.xsd
+++ b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.0.xsd
@@ -27,19 +27,21 @@
         </xsd:annotation>
         <xsd:complexType>
             <xsd:sequence>
-            	<xsd:choice minOccurs="0" maxOccurs="1">
-            		<xsd:element ref="integration:poller" />
-	                <xsd:choice minOccurs="0" maxOccurs="1">
-	            		<xsd:element ref="locker"/>
-	           		    <xsd:element ref="nio-locker"/>
-	        		</xsd:choice>
-            	</xsd:choice>
-                <xsd:choice minOccurs="0" maxOccurs="1">
-	                <xsd:choice minOccurs="0" maxOccurs="1">
-	            		<xsd:element ref="locker"/>
-	           		    <xsd:element ref="nio-locker"/>
-	        		</xsd:choice>
-	        		<xsd:element ref="integration:poller"/>
+            	<xsd:choice minOccurs="0" maxOccurs="1" >
+            		<xsd:sequence>
+	            		<xsd:element ref="integration:poller" />
+		                <xsd:choice minOccurs="0" maxOccurs="1">
+		            		<xsd:element ref="locker"/>
+		           		    <xsd:element ref="nio-locker"/>
+		        		</xsd:choice>
+		        	</xsd:sequence>
+		        	<xsd:sequence>
+		                <xsd:choice>
+		            		<xsd:element ref="locker"/>
+		           		    <xsd:element ref="nio-locker"/>
+		        		</xsd:choice>
+		        		<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
+		        	</xsd:sequence>
             	</xsd:choice>
             </xsd:sequence>
             <xsd:attribute name="id" type="xsd:string"/>