diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index e2dd490f620..128fdfc3ce8 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -57,6 +57,8 @@ API Changes
 * LUCENE-5388: Remove Reader from Tokenizer's constructor. 
   (Benson Margulies via Robert Muir - pull request #16)
 
+* LUCENE-5405: Make ShingleAnalzyerWrapper.getWrappedAnalyzer() public final (gsingers)
+
 Documentation
 
 * LUCENE-5392: Add/improve analysis package documentation to reflect
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java
index b9fb1d0df8b..b575e410983 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java
@@ -138,7 +138,7 @@ public final class ShingleAnalyzerWrapper extends AnalyzerWrapper {
   }
 
   @Override
-  protected Analyzer getWrappedAnalyzer(String fieldName) {
+  public final Analyzer getWrappedAnalyzer(String fieldName) {
     return delegate;
   }