diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileTailInboundChannelAdapterFactoryBean.java b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileTailInboundChannelAdapterFactoryBean.java
index 4e50804d63..0cbff47592 100644
--- a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileTailInboundChannelAdapterFactoryBean.java
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileTailInboundChannelAdapterFactoryBean.java
@@ -28,7 +28,7 @@ import org.springframework.integration.file.tail.ApacheCommonsFileTailingMessage
 import org.springframework.integration.file.tail.FileTailingMessageProducerSupport;
 import org.springframework.integration.file.tail.OSDelegatingFileTailingMessageProducer;
 import org.springframework.scheduling.TaskScheduler;
-import org.springframework.util.StringUtils;
+import org.springframework.util.Assert;
 
 /**
  * @author Gary Russell
@@ -180,9 +180,8 @@ public class FileTailInboundChannelAdapterFactoryBean extends AbstractFactoryBea
 			}
 		}
 		else {
-			if (this.nativeOptions != null && StringUtils.hasText(this.nativeOptions) && logger.isWarnEnabled()) {
-				logger.warn("'native-options' are ignored with an Apache commons-io 'Tailer' adapter");
-			}
+			Assert.isTrue(this.nativeOptions == null,
+					 "'native-options' is not allowed with 'delay', 'end', or 'reopen'");
 			adapter = new ApacheCommonsFileTailingMessageProducer();
 			if (this.delay != null) {
 				((ApacheCommonsFileTailingMessageProducer) adapter).setPollingDelay(this.delay);
diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/tail/FileTailingMessageProducerTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/tail/FileTailingMessageProducerTests.java
index 694fb680ab..ca41e653db 100644
--- a/spring-integration-file/src/test/java/org/springframework/integration/file/tail/FileTailingMessageProducerTests.java
+++ b/spring-integration-file/src/test/java/org/springframework/integration/file/tail/FileTailingMessageProducerTests.java
@@ -45,10 +45,10 @@ import org.springframework.integration.file.tail.FileTailingMessageProducerSuppo
  */
 public class FileTailingMessageProducerTests {
 
-	private static final String TAIL_OPTIONS_FOLLOW_NAME_MANY_LINES = "-F -n 99999999";
+	private static final String TAIL_OPTIONS_FOLLOW_NAME_ALL_LINES = "-F -n +0";
 
 	@Rule
-	public TailRule tailRule = new TailRule(TAIL_OPTIONS_FOLLOW_NAME_MANY_LINES);
+	public TailRule tailRule = new TailRule(TAIL_OPTIONS_FOLLOW_NAME_ALL_LINES);
 
 	private final Log logger = LogFactory.getLog(this.getClass());
 
@@ -76,7 +76,7 @@ public class FileTailingMessageProducerTests {
 	@TailAvailable
 	public void testOS() throws Exception {
 		OSDelegatingFileTailingMessageProducer adapter = new OSDelegatingFileTailingMessageProducer();
-		adapter.setOptions(TAIL_OPTIONS_FOLLOW_NAME_MANY_LINES);
+		adapter.setOptions(TAIL_OPTIONS_FOLLOW_NAME_ALL_LINES);
 		testGuts(adapter, "reader");
 	}
 
diff --git a/src/reference/docbook/file.xml b/src/reference/docbook/file.xml
index 9cc835c8e2..515d3f0a00 100644
--- a/src/reference/docbook/file.xml
+++ b/src/reference/docbook/file.xml
@@ -168,7 +168,8 @@
         <section id="file-tailing">
           <title>'Tail'ing Files</title>
           <para>
-            Another popular use case is to get 'lines' from the end (or tail) of a file. Two implementations are provided;
+            Another popular use case is to get 'lines' from the end (or tail) of a file, capturing new lines when
+            they are added. Two implementations are provided;
             the first, <classname>OSDelegatingFileTailingMessageProducer</classname>, uses the native <code>tail</code>
             command (on operating systems that have one). This is likely the most efficient implementation on those
             platforms. For operating systems that do not have a <code>tail</code> command, the second implementation
@@ -213,12 +214,12 @@
           </para>
           <programlisting language="xml"><![CDATA[<int-file:tail-inbound-channel-adapter id="native"
 	channel="input"
-	native-options="-F -n 6"
+	native-options="-F -n +0"
 	task-executor="exec"
 	file-delay=10000
 	file="/tmp/foo"/>]]></programlisting>
           <para>
-            This creates a native adapter with '-F -n 6' options (follow the file name, emit up to 6 lines before the current end).
+            This creates a native adapter with '-F -n +0' options (follow the file name, emitting all existing lines).
             If the tail command fails (on some platforms, a missing file causes the <code>tail</code> to fail, even with
             <code>-F</code> specified), the command will be retried every 10 seconds.
           </para>
@@ -231,11 +232,18 @@
 	reopen="true"
 	file-delay="10000"/>]]></programlisting>
           <para>
-            This creates a commons-io <classname>Tailer</classname> adapter that examines the file for new lines every
+            This creates an Apache commons-io <classname>Tailer</classname> adapter that examines the file for new lines every
             2 seconds, and checks for existence of a missing file every 10 seconds. The file will be tailed from the
             beginning (<code>end="false"</code>) instead of the end (which is the default). The file will be
             reopened for each chunk (the default is to keep the file open).
           </para>
+          <important>
+            <para>
+              Specifying the <code>delay</code>, <code>end</code> or <code>reopen</code> attributes,
+              forces the use of the Apache commons-io adapter and the <code>native-options</code> attribute is not
+              allowed.
+            </para>
+          </important>
         </section>
   </section>
 	<section id="file-writing">