diff --git a/CHANGES.txt b/CHANGES.txt
index 6045690a2d5..4e9c7ee35f2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -86,6 +86,9 @@ API Changes
 12. LUCENE-1325: Added IndexCommit.isOptimized().  (Shalin Shekhar
     Mangar via Mike McCandless)
 
+13. LUCENE-1324: Added TokenFilter.reset(). (Shai Erera via Mike
+    McCandless)
+
 Bug fixes
     
  1. LUCENE-1134: Fixed BooleanQuery.rewrite to only optimize a single 
diff --git a/src/java/org/apache/lucene/analysis/TokenFilter.java b/src/java/org/apache/lucene/analysis/TokenFilter.java
index dc6cf9366d7..3b2591e6f2c 100644
--- a/src/java/org/apache/lucene/analysis/TokenFilter.java
+++ b/src/java/org/apache/lucene/analysis/TokenFilter.java
@@ -39,4 +39,9 @@ public abstract class TokenFilter extends TokenStream {
     input.close();
   }
 
+  /** Reset the filter as well as the input TokenStream. */
+  public void reset() throws IOException {
+    super.reset();
+    input.reset();
+  }
 }