diff --git a/CHANGES.txt b/CHANGES.txt
index 91dcc3dd23a..db93f3a2332 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -19,6 +19,8 @@ Release 0.20.0 - Unreleased
                (K M via Jean-Daniel Cryans)
    HBASE-1175  HBA administrative tools do not work when specifying region
                name (Jonathan Gray via Andrew Purtell)
+   HBASE-1190  TableInputFormatBase with row filters scan too far (Dave
+               Latham via Andrew Purtell)
 
   IMPROVEMENTS
    HBASE-1089  Add count of regions on filesystem to master UI; add percentage
diff --git a/src/java/org/apache/hadoop/hbase/mapred/TableInputFormatBase.java b/src/java/org/apache/hadoop/hbase/mapred/TableInputFormatBase.java
index 0fe1f2ece25..f7b4cdc99a3 100644
--- a/src/java/org/apache/hadoop/hbase/mapred/TableInputFormatBase.java
+++ b/src/java/org/apache/hadoop/hbase/mapred/TableInputFormatBase.java
@@ -32,6 +32,7 @@ import org.apache.hadoop.hbase.client.Scanner;
 import org.apache.hadoop.hbase.filter.RowFilterInterface;
 import org.apache.hadoop.hbase.filter.RowFilterSet;
 import org.apache.hadoop.hbase.filter.StopRowFilter;
+import org.apache.hadoop.hbase.filter.WhileMatchRowFilter;
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
 import org.apache.hadoop.hbase.io.RowResult;
 import org.apache.hadoop.hbase.util.Writables;
@@ -102,7 +103,7 @@ implements InputFormat<ImmutableBytesWritable, RowResult> {
         if (trrRowFilter != null) {
           final Set<RowFilterInterface> rowFiltersSet =
             new HashSet<RowFilterInterface>();
-          rowFiltersSet.add(new StopRowFilter(endRow));
+          rowFiltersSet.add(new WhileMatchRowFilter(new StopRowFilter(endRow)));
           rowFiltersSet.add(trrRowFilter);
           this.scanner = this.htable.getScanner(trrInputColumns, startRow,
             new RowFilterSet(RowFilterSet.Operator.MUST_PASS_ALL,