diff --git a/CHANGES.txt b/CHANGES.txt
index 0f15312270a..c1bb9fd9c41 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -331,6 +331,9 @@ Bug Fixes
     incorrectly treated as relative paths. (hossman)
 
 36. SOLR-1104: Fix some rounding errors in LukeRequestHandler's histogram (hossman)
+
+37. SOLR-1125: Use query analyzer rather than index analyzer for queryFieldType in QueryElevationComponent
+    (koji)
     
 Other Changes
 ----------------------
diff --git a/src/java/org/apache/solr/handler/component/QueryElevationComponent.java b/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
index 8a1a32aefc4..e2df6f515ff 100644
--- a/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
+++ b/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
@@ -151,7 +151,7 @@ public class QueryElevationComponent extends SearchComponent implements SolrCore
         throw new SolrException( SolrException.ErrorCode.SERVER_ERROR,
             "Unknown FieldType: '"+a+"' used in QueryElevationComponent" );
       }
-      analyzer = ft.getAnalyzer();
+      analyzer = ft.getQueryAnalyzer();
     }
 
     SchemaField sf = core.getSchema().getUniqueKeyField();