diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/phonetic/PhoneticTokenFilterFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/phonetic/PhoneticTokenFilterFactory.java
index e1800a5129e..c9e11bed072 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/phonetic/PhoneticTokenFilterFactory.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/phonetic/PhoneticTokenFilterFactory.java
@@ -52,10 +52,16 @@ public class PhoneticTokenFilterFactory extends AbstractTokenFilterFactory {
             this.encoder = new Metaphone();
         } else if ("soundex".equalsIgnoreCase(encoder)) {
             this.encoder = new Soundex();
+        } else if ("caverphone1".equalsIgnoreCase(encoder)) {
+            this.encoder = new Caverphone1();
+        } else if ("caverphone2".equalsIgnoreCase(encoder)) {
+            this.encoder = new Caverphone2();
         } else if ("caverphone".equalsIgnoreCase(encoder)) {
-            this.encoder = new Caverphone();
+            this.encoder = new Caverphone2();
         } else if ("refined_soundex".equalsIgnoreCase(encoder) || "refinedSoundex".equalsIgnoreCase(encoder)) {
             this.encoder = new RefinedSoundex();
+        } else if ("cologne".equalsIgnoreCase(encoder)) {
+            this.encoder = new ColognePhonetic();
         } else if ("double_metaphone".equalsIgnoreCase(encoder) || "doubleMetaphone".equalsIgnoreCase(encoder)) {
             DoubleMetaphone doubleMetaphone = new DoubleMetaphone();
             doubleMetaphone.setMaxCodeLen(settings.getAsInt("max_code_len", doubleMetaphone.getMaxCodeLen()));
diff --git a/modules/jarjar/build.gradle b/modules/jarjar/build.gradle
index dbe20c042bc..290628f43ef 100644
--- a/modules/jarjar/build.gradle
+++ b/modules/jarjar/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     runtime 'org.elasticsearch:es-trove:3.0.0rc1'
     runtime 'org.elasticsearch:es-jsr166y:20110209'
 
-    runtime 'commons-codec:commons-codec:1.4'
+    runtime 'commons-codec:commons-codec:1.5'
 
     runtime 'joda-time:joda-time:1.6.1'
     runtime 'org.mvel:mvel2:2.1.beta2'