diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 8bae8d75fa0..b4e06d73441 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -211,8 +211,8 @@ Other
 * LUCENE-6174: Improve "ant eclipse" to select right JRE for building.
   (Uwe Schindler, Dawid Weiss)
 
-* LUCENE-6417: Upgrade ANTLR used in expressions module to version 4.5.
-  (Jack Conradson, Uwe Schindler)
+* LUCENE-6417, LUCENE-6830: Upgrade ANTLR used in expressions module
+  to version 4.5.1-1.  (Jack Conradson, Uwe Schindler)
 
 * LUCENE-6729: Upgrade ASM used in expressions module to version 5.0.4.
   (Uwe Schindler)
diff --git a/lucene/expressions/build.xml b/lucene/expressions/build.xml
index a6c81e6d2d3..1dddc6dfbf4 100644
--- a/lucene/expressions/build.xml
+++ b/lucene/expressions/build.xml
@@ -48,7 +48,7 @@
   <target name="regenerate" depends="run-antlr"/>
 
   <target name="resolve-antlr" xmlns:ivy="antlib:org.apache.ivy.ant">
-    <ivy:cachepath organisation="org.antlr" module="antlr4" revision="4.5"
+    <ivy:cachepath organisation="org.antlr" module="antlr4" revision="4.5.1-1"
                   inline="true" conf="default" type="jar" pathid="antlr.classpath"/>
   </target>
 
diff --git a/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptBaseVisitor.java b/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptBaseVisitor.java
index 2ddc90b81b5..874b66a8c0c 100644
--- a/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptBaseVisitor.java
+++ b/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptBaseVisitor.java
@@ -1,6 +1,5 @@
 // ANTLR GENERATED CODE: DO NOT EDIT
 package org.apache.lucene.expressions.js;
-import org.antlr.v4.runtime.misc.NotNull;
 import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
 
 /**
diff --git a/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptLexer.java b/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptLexer.java
index a574add6be9..4827dc41410 100644
--- a/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptLexer.java
+++ b/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptLexer.java
@@ -11,7 +11,7 @@ import org.antlr.v4.runtime.misc.*;
 
 @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
 class JavascriptLexer extends Lexer {
-  static { RuntimeMetaData.checkVersion("4.5", RuntimeMetaData.VERSION); }
+  static { RuntimeMetaData.checkVersion("4.5.1", RuntimeMetaData.VERSION); }
 
   protected static final DFA[] _decisionToDFA;
   protected static final PredictionContextCache _sharedContextCache =
diff --git a/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptParser.java b/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptParser.java
index d682a47d066..463f288e56d 100644
--- a/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptParser.java
+++ b/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptParser.java
@@ -11,7 +11,7 @@ import java.util.ArrayList;
 
 @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
 class JavascriptParser extends Parser {
-  static { RuntimeMetaData.checkVersion("4.5", RuntimeMetaData.VERSION); }
+  static { RuntimeMetaData.checkVersion("4.5.1", RuntimeMetaData.VERSION); }
 
   protected static final DFA[] _decisionToDFA;
   protected static final PredictionContextCache _sharedContextCache =
diff --git a/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptVisitor.java b/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptVisitor.java
index 797f5647b9f..5977736797a 100644
--- a/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptVisitor.java
+++ b/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptVisitor.java
@@ -1,6 +1,5 @@
 // ANTLR GENERATED CODE: DO NOT EDIT
 package org.apache.lucene.expressions.js;
-import org.antlr.v4.runtime.misc.NotNull;
 import org.antlr.v4.runtime.tree.ParseTreeVisitor;
 
 /**
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index bf847c662e3..0b6db2141ff 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -89,7 +89,7 @@ com.sun.jersey.version = 1.9
 /net.sourceforge.argparse4j/argparse4j = 0.4.3
 /net.sourceforge.jmatio/jmatio = 1.0
 /net.sourceforge.nekohtml/nekohtml = 1.9.17
-/org.antlr/antlr4-runtime = 4.5
+/org.antlr/antlr4-runtime = 4.5.1-1
 
 /org.apache.ant/ant = 1.8.2
 /org.apache.avro/avro = 1.7.5
diff --git a/lucene/licenses/antlr4-runtime-4.5.1-1.jar.sha1 b/lucene/licenses/antlr4-runtime-4.5.1-1.jar.sha1
new file mode 100644
index 00000000000..f15e50069ba
--- /dev/null
+++ b/lucene/licenses/antlr4-runtime-4.5.1-1.jar.sha1
@@ -0,0 +1 @@
+66144204f9d6d7d3f3f775622c2dd7e9bd511d97
diff --git a/lucene/licenses/antlr4-runtime-4.5.jar.sha1 b/lucene/licenses/antlr4-runtime-4.5.jar.sha1
deleted file mode 100644
index 5299c19c73b..00000000000
--- a/lucene/licenses/antlr4-runtime-4.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-29e48af049f17dd89153b83a7ad5d01b3b4bcdda
diff --git a/solr/licenses/antlr4-runtime-4.5.1-1.jar.sha1 b/solr/licenses/antlr4-runtime-4.5.1-1.jar.sha1
new file mode 100644
index 00000000000..f15e50069ba
--- /dev/null
+++ b/solr/licenses/antlr4-runtime-4.5.1-1.jar.sha1
@@ -0,0 +1 @@
+66144204f9d6d7d3f3f775622c2dd7e9bd511d97
diff --git a/solr/licenses/antlr4-runtime-4.5.jar.sha1 b/solr/licenses/antlr4-runtime-4.5.jar.sha1
deleted file mode 100644
index 5299c19c73b..00000000000
--- a/solr/licenses/antlr4-runtime-4.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-29e48af049f17dd89153b83a7ad5d01b3b4bcdda