diff --git a/dev-tools/eclipse/dot.classpath b/dev-tools/eclipse/dot.classpath
index 4177ce0d914..041d13a5a80 100644
--- a/dev-tools/eclipse/dot.classpath
+++ b/dev-tools/eclipse/dot.classpath
@@ -103,7 +103,7 @@
   <classpathentry kind="lib" path="lucene/test-framework/lib/junit-4.10.jar"/>
   <classpathentry kind="lib" path="lucene/sandbox/lib/jakarta-regexp-1.4.jar"/>
   <classpathentry kind="lib" path="lucene/analysis/icu/lib/icu4j-49.1.jar"/>
-  <classpathentry kind="lib" path="lucene/analysis/phonetic/lib/commons-codec-1.6.jar"/>
+  <classpathentry kind="lib" path="lucene/analysis/phonetic/lib/commons-codec-1.7.jar"/>
   <classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-fsa-1.5.3.jar"/>
   <classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-polish-1.5.3.jar"/>
   <classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-stemming-1.5.3.jar"/>
diff --git a/dev-tools/maven/pom.xml.template b/dev-tools/maven/pom.xml.template
index 9ba2ddd1d37..7e63d07d17d 100644
--- a/dev-tools/maven/pom.xml.template
+++ b/dev-tools/maven/pom.xml.template
@@ -152,7 +152,7 @@
       <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
-        <version>1.6</version>
+        <version>1.7</version>
       </dependency>
       <dependency>
         <groupId>commons-cli</groupId>
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 516a2f1f53e..57fe36a6f8b 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -164,6 +164,9 @@ Bug Fixes
   RAM, instead of checking the estimated size of the segment
   to decide whether to cache it. (Mike McCandless)
 
+* LUCENE-3720: fix memory-consumption issues with BeiderMorseFilter.
+  (Thomas Neidhart via Robert Muir)
+
 Optimizations
 
 * LUCENE-4322: Decrease lucene-core JAR size. The core JAR size had increased a
diff --git a/lucene/analysis/README.txt b/lucene/analysis/README.txt
index b579ad4dc63..7dc7f5397eb 100644
--- a/lucene/analysis/README.txt
+++ b/lucene/analysis/README.txt
@@ -31,7 +31,7 @@ lucene-analyzers-morfologik-XX.jar
 lucene-analyzers-phonetic-XX.jar
   An add-on analysis library that provides phonetic encoders via Apache
   Commons-Codec. Note: this module depends on the commons-codec jar 
-  file (version >= 1.4)
+  file
   
 lucene-analyzers-smartcn-XX.jar
   An add-on analysis library that provides word segmentation for Simplified
diff --git a/lucene/analysis/phonetic/build.xml b/lucene/analysis/phonetic/build.xml
index 5d8678f517d..a33e499ed04 100644
--- a/lucene/analysis/phonetic/build.xml
+++ b/lucene/analysis/phonetic/build.xml
@@ -27,7 +27,7 @@
 
   <path id="classpath">
     <pathelement path="${analyzers-common.jar}"/>
-    <pathelement path="lib/commons-codec-1.6.jar"/>
+    <pathelement path="lib/commons-codec-1.7.jar"/>
     <path refid="base.classpath"/>
   </path>
 
diff --git a/lucene/analysis/phonetic/ivy.xml b/lucene/analysis/phonetic/ivy.xml
index 1da4efb2166..1c2ae951ea1 100644
--- a/lucene/analysis/phonetic/ivy.xml
+++ b/lucene/analysis/phonetic/ivy.xml
@@ -19,7 +19,7 @@
 <ivy-module version="2.0">
     <info organisation="org.apache.lucene" module="analyzers-phonetic"/>
     <dependencies>
-      <dependency org="commons-codec" name="commons-codec" rev="1.6" transitive="false"/>
+      <dependency org="commons-codec" name="commons-codec" rev="1.7" transitive="false"/>
       <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/> 
     </dependencies>
 </ivy-module>
diff --git a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/BeiderMorseFilter.java b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/BeiderMorseFilter.java
index 226c604f8e2..ae2c44009dc 100644
--- a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/BeiderMorseFilter.java
+++ b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/BeiderMorseFilter.java
@@ -32,12 +32,6 @@ import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
 
 /**
  * TokenFilter for Beider-Morse phonetic encoding.
- * <p>
- * <b><font color="red">
- * WARNING: some inputs can cause extremely high RAM usage! 
- * https://issues.apache.org/jira/browse/CODEC-132
- * </font></b>
- * </p>
  * @see BeiderMorseEncoder
  * @lucene.experimental
  */
diff --git a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilter.java b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilter.java
index b8c74c3d23b..da8fe51358a 100644
--- a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilter.java
+++ b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilter.java
@@ -88,8 +88,7 @@ public class TestBeiderMorseFilter extends BaseTokenStreamTestCase {
         new int[] { 4 },
         new int[] { 1 });
   }
-  
-  @Ignore("broken: causes OOM on some strings (https://issues.apache.org/jira/browse/CODEC-132)")
+
   public void testRandom() throws Exception {
     checkRandomData(random(), analyzer, 1000 * RANDOM_MULTIPLIER); 
   }
diff --git a/lucene/licenses/commons-codec-1.6.jar.sha1 b/lucene/licenses/commons-codec-1.6.jar.sha1
deleted file mode 100644
index bf78aff7364..00000000000
--- a/lucene/licenses/commons-codec-1.6.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b7f0fc8f61ecadeb3695f0b9464755eee44374d4
diff --git a/lucene/licenses/commons-codec-1.7.jar.sha1 b/lucene/licenses/commons-codec-1.7.jar.sha1
new file mode 100644
index 00000000000..3239d5ed5ec
--- /dev/null
+++ b/lucene/licenses/commons-codec-1.7.jar.sha1
@@ -0,0 +1 @@
+9cd61d269c88f9fb0eb36cea1efcd596ab74772f
diff --git a/solr/core/ivy.xml b/solr/core/ivy.xml
index 61af247d01a..c49d15d7622 100644
--- a/solr/core/ivy.xml
+++ b/solr/core/ivy.xml
@@ -20,7 +20,7 @@
     <info organisation="org.apache.solr" module="core"/>
 
     <dependencies>
-      <dependency org="commons-codec" name="commons-codec" rev="1.6" transitive="false"/>
+      <dependency org="commons-codec" name="commons-codec" rev="1.7" transitive="false"/>
       <dependency org="commons-fileupload" name="commons-fileupload" rev="1.2.1" transitive="false"/>
       <dependency org="commons-cli" name="commons-cli" rev="1.2" transitive="false"/>
       <dependency org="commons-lang" name="commons-lang" rev="2.6" transitive="false"/>
diff --git a/solr/licenses/commons-codec-1.6.jar.sha1 b/solr/licenses/commons-codec-1.6.jar.sha1
deleted file mode 100644
index bf78aff7364..00000000000
--- a/solr/licenses/commons-codec-1.6.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b7f0fc8f61ecadeb3695f0b9464755eee44374d4
diff --git a/solr/licenses/commons-codec-1.7.jar.sha1 b/solr/licenses/commons-codec-1.7.jar.sha1
new file mode 100644
index 00000000000..3239d5ed5ec
--- /dev/null
+++ b/solr/licenses/commons-codec-1.7.jar.sha1
@@ -0,0 +1 @@
+9cd61d269c88f9fb0eb36cea1efcd596ab74772f