diff --git a/CHANGES.txt b/CHANGES.txt
index 63c21c858c3..f8030e48e9c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -85,6 +85,9 @@ API Changes
     for that Directory.
     (Michael McCandless, Jeff Patterson via Yonik Seeley)
 
+ 9. LUCENE-657: Made FuzzyQuery non-final and inner ScoreTerm protected.
+    (Steven Parkes via Otis Gospodnetic)
+
 Bug fixes
 
  1. Fixed the web application demo (built with "ant war-demo") which
diff --git a/src/java/org/apache/lucene/search/FuzzyQuery.java b/src/java/org/apache/lucene/search/FuzzyQuery.java
index f642abbc584..007f2619fad 100644
--- a/src/java/org/apache/lucene/search/FuzzyQuery.java
+++ b/src/java/org/apache/lucene/search/FuzzyQuery.java
@@ -26,7 +26,7 @@ import java.io.IOException;
 /** Implements the fuzzy search query. The similiarity measurement
  * is based on the Levenshtein (edit distance) algorithm.
  */
-public final class FuzzyQuery extends MultiTermQuery {
+public class FuzzyQuery extends MultiTermQuery {
   
   public final static float defaultMinSimilarity = 0.5f;
   public final static int defaultPrefixLength = 0;
@@ -149,7 +149,7 @@ public final class FuzzyQuery extends MultiTermQuery {
     return buffer.toString();
   }
   
-  private static class ScoreTerm{
+  protected static class ScoreTerm {
     public Term term;
     public float score;
     
@@ -159,7 +159,7 @@ public final class FuzzyQuery extends MultiTermQuery {
     }
   }
   
-  private static class ScoreTermQueue extends PriorityQueue {
+  protected static class ScoreTermQueue extends PriorityQueue {
     
     public ScoreTermQueue(int size){
       initialize(size);