diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index ddbf87c4a71..741a5d0c508 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -1,6 +1,6 @@
 # When updating elasticsearch, please update 'rest' version in core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy
 elasticsearch     = 6.0.0-alpha1
-lucene            = 6.4.0
+lucene            = 6.4.1
 
 # optional dependencies
 spatial4j         = 0.6
diff --git a/core/licenses/lucene-analyzers-common-6.4.0.jar.sha1 b/core/licenses/lucene-analyzers-common-6.4.0.jar.sha1
deleted file mode 100644
index f0934e93d51..00000000000
--- a/core/licenses/lucene-analyzers-common-6.4.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e0feb9281a7da7a7df62398ab0fc655d51f68fed
\ No newline at end of file
diff --git a/core/licenses/lucene-analyzers-common-6.4.1.jar.sha1 b/core/licenses/lucene-analyzers-common-6.4.1.jar.sha1
new file mode 100644
index 00000000000..5b51b32b779
--- /dev/null
+++ b/core/licenses/lucene-analyzers-common-6.4.1.jar.sha1
@@ -0,0 +1 @@
+c6f0f593503080204e9d33189cdc59320f55db37
\ No newline at end of file
diff --git a/core/licenses/lucene-backward-codecs-6.4.0.jar.sha1 b/core/licenses/lucene-backward-codecs-6.4.0.jar.sha1
deleted file mode 100644
index 8ba9e440224..00000000000
--- a/core/licenses/lucene-backward-codecs-6.4.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-14698ecbca1437615ee31d412d0edd3440b4fccf
\ No newline at end of file
diff --git a/core/licenses/lucene-backward-codecs-6.4.1.jar.sha1 b/core/licenses/lucene-backward-codecs-6.4.1.jar.sha1
new file mode 100644
index 00000000000..481e10fdb07
--- /dev/null
+++ b/core/licenses/lucene-backward-codecs-6.4.1.jar.sha1
@@ -0,0 +1 @@
+b0ab8aca2b0025b8733411778b6d27afe1c451f5
\ No newline at end of file
diff --git a/core/licenses/lucene-core-6.4.0.jar.sha1 b/core/licenses/lucene-core-6.4.0.jar.sha1
deleted file mode 100644
index e8e74ddc7a3..00000000000
--- a/core/licenses/lucene-core-6.4.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-09dd516b847dcaf8da4e9096bf3189b0b3607aef
\ No newline at end of file
diff --git a/core/licenses/lucene-core-6.4.1.jar.sha1 b/core/licenses/lucene-core-6.4.1.jar.sha1
new file mode 100644
index 00000000000..e02b643c8ad
--- /dev/null
+++ b/core/licenses/lucene-core-6.4.1.jar.sha1
@@ -0,0 +1 @@
+2a18924b9e0ed86b318902cb475a0b9ca4d7be5b
\ No newline at end of file
diff --git a/core/licenses/lucene-grouping-6.4.0.jar.sha1 b/core/licenses/lucene-grouping-6.4.0.jar.sha1
deleted file mode 100644
index 9a54629dcd4..00000000000
--- a/core/licenses/lucene-grouping-6.4.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-68a8f986a0076ad784cbb20813b9465b94e4c846
\ No newline at end of file
diff --git a/core/licenses/lucene-grouping-6.4.1.jar.sha1 b/core/licenses/lucene-grouping-6.4.1.jar.sha1
new file mode 100644
index 00000000000..98fd2f55e25
--- /dev/null
+++ b/core/licenses/lucene-grouping-6.4.1.jar.sha1
@@ -0,0 +1 @@
+8297adfa469abd571079ee75a1645fc5124fff5b
\ No newline at end of file
diff --git a/core/licenses/lucene-highlighter-6.4.0.jar.sha1 b/core/licenses/lucene-highlighter-6.4.0.jar.sha1
deleted file mode 100644
index fd11e9112fb..00000000000
--- a/core/licenses/lucene-highlighter-6.4.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6d921c1242b608a4dcd0784e32bcd94097ad93cd
\ No newline at end of file
diff --git a/core/licenses/lucene-highlighter-6.4.1.jar.sha1 b/core/licenses/lucene-highlighter-6.4.1.jar.sha1
new file mode 100644
index 00000000000..d61105265af
--- /dev/null
+++ b/core/licenses/lucene-highlighter-6.4.1.jar.sha1
@@ -0,0 +1 @@
+95c0f76fc7893240483b25a5c420bed77a10d05d
\ No newline at end of file
diff --git a/core/licenses/lucene-join-6.4.0.jar.sha1 b/core/licenses/lucene-join-6.4.0.jar.sha1
deleted file mode 100644
index 171a8dfe26c..00000000000
--- a/core/licenses/lucene-join-6.4.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-74d3cdf1bc863e3836b06f1865c970127cc15f26
\ No newline at end of file
diff --git a/core/licenses/lucene-join-6.4.1.jar.sha1 b/core/licenses/lucene-join-6.4.1.jar.sha1
new file mode 100644
index 00000000000..d63fed772fd
--- /dev/null
+++ b/core/licenses/lucene-join-6.4.1.jar.sha1
@@ -0,0 +1 @@
+6d2f1ff94dba19b9bc6f15930b7104b890cab1ce
\ No newline at end of file
diff --git a/core/licenses/lucene-memory-6.4.0.jar.sha1 b/core/licenses/lucene-memory-6.4.0.jar.sha1
deleted file mode 100644
index 2ffd52a6f39..00000000000
--- a/core/licenses/lucene-memory-6.4.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dd13729c0b401e3df11bce0c343d1e00f07b9a19
\ No newline at end of file
diff --git a/core/licenses/lucene-memory-6.4.1.jar.sha1 b/core/licenses/lucene-memory-6.4.1.jar.sha1
new file mode 100644
index 00000000000..808557a1bcc
--- /dev/null
+++ b/core/licenses/lucene-memory-6.4.1.jar.sha1
@@ -0,0 +1 @@
+825a946902f03a38257851733da908949d69f3da
\ No newline at end of file
diff --git a/core/licenses/lucene-misc-6.4.0.jar.sha1 b/core/licenses/lucene-misc-6.4.0.jar.sha1
deleted file mode 100644
index 69c41bc81b0..00000000000
--- a/core/licenses/lucene-misc-6.4.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ce27abe3490bb8ccbebd2eefcb68f42a609ca986
\ No newline at end of file
diff --git a/core/licenses/lucene-misc-6.4.1.jar.sha1 b/core/licenses/lucene-misc-6.4.1.jar.sha1
new file mode 100644
index 00000000000..ae47a860bb9
--- /dev/null
+++ b/core/licenses/lucene-misc-6.4.1.jar.sha1
@@ -0,0 +1 @@
+4d147a6f0fcfc54630260d1bb3deecfc0d0d10f7
\ No newline at end of file
diff --git a/core/licenses/lucene-queries-6.4.0.jar.sha1 b/core/licenses/lucene-queries-6.4.0.jar.sha1
deleted file mode 100644
index 1ce80d5ba80..00000000000
--- a/core/licenses/lucene-queries-6.4.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bd1978e3fdac2fadf1068828b0b1b534a56873c3
\ No newline at end of file
diff --git a/core/licenses/lucene-queries-6.4.1.jar.sha1 b/core/licenses/lucene-queries-6.4.1.jar.sha1
new file mode 100644
index 00000000000..0e015acc9ae
--- /dev/null
+++ b/core/licenses/lucene-queries-6.4.1.jar.sha1
@@ -0,0 +1 @@
+6de41d984c16185a244b52c4d069b00f5b2b120f
\ No newline at end of file
diff --git a/core/licenses/lucene-queryparser-6.4.0.jar.sha1 b/core/licenses/lucene-queryparser-6.4.0.jar.sha1
deleted file mode 100644
index 155c688840d..00000000000
--- a/core/licenses/lucene-queryparser-6.4.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fb8fe41948fccf13b5dbb5d50441cac974544ade
\ No newline at end of file
diff --git a/core/licenses/lucene-queryparser-6.4.1.jar.sha1 b/core/licenses/lucene-queryparser-6.4.1.jar.sha1
new file mode 100644
index 00000000000..ee7eb78d6c2
--- /dev/null
+++ b/core/licenses/lucene-queryparser-6.4.1.jar.sha1
@@ -0,0 +1 @@
+1fc5795a072770a2c47dce11a3c85a80f3437af6
\ No newline at end of file
diff --git a/core/licenses/lucene-sandbox-6.4.0.jar.sha1 b/core/licenses/lucene-sandbox-6.4.0.jar.sha1
deleted file mode 100644
index 7df93d742c3..00000000000
--- a/core/licenses/lucene-sandbox-6.4.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e7f7d1ad298c4af264199d9199f34f2e4d9ca2b5
\ No newline at end of file
diff --git a/core/licenses/lucene-sandbox-6.4.1.jar.sha1 b/core/licenses/lucene-sandbox-6.4.1.jar.sha1
new file mode 100644
index 00000000000..caa6302e36f
--- /dev/null
+++ b/core/licenses/lucene-sandbox-6.4.1.jar.sha1
@@ -0,0 +1 @@
+d4a49664668c58aa23aba74717f3d74a61378d7c
\ No newline at end of file
diff --git a/core/licenses/lucene-spatial-6.4.0.jar.sha1 b/core/licenses/lucene-spatial-6.4.0.jar.sha1
deleted file mode 100644
index 78dd7de93d0..00000000000
--- a/core/licenses/lucene-spatial-6.4.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5d4b3ce4df83d0509e0b5f7eecda72af458ba225
\ No newline at end of file
diff --git a/core/licenses/lucene-spatial-6.4.1.jar.sha1 b/core/licenses/lucene-spatial-6.4.1.jar.sha1
new file mode 100644
index 00000000000..250c504c96e
--- /dev/null
+++ b/core/licenses/lucene-spatial-6.4.1.jar.sha1
@@ -0,0 +1 @@
+d6ceb47fdea913a8f468a240a6ea307368094463
\ No newline at end of file
diff --git a/core/licenses/lucene-spatial-extras-6.4.0.jar.sha1 b/core/licenses/lucene-spatial-extras-6.4.0.jar.sha1
deleted file mode 100644
index 016fd2b6ddd..00000000000
--- a/core/licenses/lucene-spatial-extras-6.4.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3b486b51d3aede074ab6de890b427379d40c0438
\ No newline at end of file
diff --git a/core/licenses/lucene-spatial-extras-6.4.1.jar.sha1 b/core/licenses/lucene-spatial-extras-6.4.1.jar.sha1
new file mode 100644
index 00000000000..e30811d727e
--- /dev/null
+++ b/core/licenses/lucene-spatial-extras-6.4.1.jar.sha1
@@ -0,0 +1 @@
+5b764e5f95f610f79622ca0e957bfc23f094e4c7
\ No newline at end of file
diff --git a/core/licenses/lucene-spatial3d-6.4.0.jar.sha1 b/core/licenses/lucene-spatial3d-6.4.0.jar.sha1
deleted file mode 100644
index 3d7cd4e751f..00000000000
--- a/core/licenses/lucene-spatial3d-6.4.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-344097014aeaaa0f94a217f3697e14ceee06581f
\ No newline at end of file
diff --git a/core/licenses/lucene-spatial3d-6.4.1.jar.sha1 b/core/licenses/lucene-spatial3d-6.4.1.jar.sha1
new file mode 100644
index 00000000000..9f5354e3985
--- /dev/null
+++ b/core/licenses/lucene-spatial3d-6.4.1.jar.sha1
@@ -0,0 +1 @@
+2c58459e671040046305dbee698fce1e6a1de71d
\ No newline at end of file
diff --git a/core/licenses/lucene-suggest-6.4.0.jar.sha1 b/core/licenses/lucene-suggest-6.4.0.jar.sha1
deleted file mode 100644
index 2cfe897d139..00000000000
--- a/core/licenses/lucene-suggest-6.4.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6c4706b86718f2653120e0dbfd24e03248dd2ea7
\ No newline at end of file
diff --git a/core/licenses/lucene-suggest-6.4.1.jar.sha1 b/core/licenses/lucene-suggest-6.4.1.jar.sha1
new file mode 100644
index 00000000000..d35a2b88d2b
--- /dev/null
+++ b/core/licenses/lucene-suggest-6.4.1.jar.sha1
@@ -0,0 +1 @@
+47014b400916eea259645a9e3118558ef6e95441
\ No newline at end of file
diff --git a/core/src/main/java/org/apache/lucene/queries/BlendedTermQuery.java b/core/src/main/java/org/apache/lucene/queries/BlendedTermQuery.java
index a4b94b007fd..0b34a95710c 100644
--- a/core/src/main/java/org/apache/lucene/queries/BlendedTermQuery.java
+++ b/core/src/main/java/org/apache/lucene/queries/BlendedTermQuery.java
@@ -163,7 +163,7 @@ public abstract class BlendedTermQuery extends Query {
             if (prev > current) {
                 actualDf++;
             }
-            contexts[i] = ctx = adjustDF(ctx, Math.min(maxDoc, actualDf));
+            contexts[i] = ctx = adjustDF(reader.getContext(), ctx, Math.min(maxDoc, actualDf));
             prev = current;
             if (sumTTF >= 0 && ctx.totalTermFreq() >= 0) {
                 sumTTF += ctx.totalTermFreq();
@@ -179,16 +179,17 @@ public abstract class BlendedTermQuery extends Query {
             }
             // the blended sumTTF can't be greater than the sumTTTF on the field
             final long fixedTTF = sumTTF == -1 ? -1 : sumTTF;
-            contexts[i] = adjustTTF(contexts[i], fixedTTF);
+            contexts[i] = adjustTTF(reader.getContext(), contexts[i], fixedTTF);
         }
     }
 
-    private TermContext adjustTTF(TermContext termContext, long sumTTF) {
+    private TermContext adjustTTF(IndexReaderContext readerContext, TermContext termContext, long sumTTF) {
+        assert termContext.wasBuiltFor(readerContext);
         if (sumTTF == -1 && termContext.totalTermFreq() == -1) {
             return termContext;
         }
-        TermContext newTermContext = new TermContext(termContext.topReaderContext);
-        List<LeafReaderContext> leaves = termContext.topReaderContext.leaves();
+        TermContext newTermContext = new TermContext(readerContext);
+        List<LeafReaderContext> leaves = readerContext.leaves();
         final int len;
         if (leaves == null) {
             len = 1;
@@ -209,7 +210,8 @@ public abstract class BlendedTermQuery extends Query {
         return newTermContext;
     }
 
-    private static TermContext adjustDF(TermContext ctx, int newDocFreq) {
+    private static TermContext adjustDF(IndexReaderContext readerContext, TermContext ctx, int newDocFreq) {
+        assert ctx.wasBuiltFor(readerContext);
         // Use a value of ttf that is consistent with the doc freq (ie. gte)
         long newTTF;
         if (ctx.totalTermFreq() < 0) {
@@ -217,14 +219,14 @@ public abstract class BlendedTermQuery extends Query {
         } else {
             newTTF = Math.max(ctx.totalTermFreq(), newDocFreq);
         }
-        List<LeafReaderContext> leaves = ctx.topReaderContext.leaves();
+        List<LeafReaderContext> leaves = readerContext.leaves();
         final int len;
         if (leaves == null) {
             len = 1;
         } else {
             len = leaves.size();
         }
-        TermContext newCtx = new TermContext(ctx.topReaderContext);
+        TermContext newCtx = new TermContext(readerContext);
         for (int i = 0; i < len; ++i) {
             TermState termState = ctx.get(i);
             if (termState == null) {
diff --git a/core/src/main/java/org/elasticsearch/Version.java b/core/src/main/java/org/elasticsearch/Version.java
index ccd6f7c9a06..6c6200cb7e5 100644
--- a/core/src/main/java/org/elasticsearch/Version.java
+++ b/core/src/main/java/org/elasticsearch/Version.java
@@ -111,10 +111,10 @@ public class Version implements Comparable<Version> {
     public static final int V_5_2_1_ID_UNRELEASED = 5020199;
     public static final Version V_5_2_1_UNRELEASED = new Version(V_5_2_1_ID_UNRELEASED, org.apache.lucene.util.Version.LUCENE_6_4_0);
     public static final int V_5_3_0_ID_UNRELEASED = 5030099;
-    public static final Version V_5_3_0_UNRELEASED = new Version(V_5_3_0_ID_UNRELEASED, org.apache.lucene.util.Version.LUCENE_6_4_0);
+    public static final Version V_5_3_0_UNRELEASED = new Version(V_5_3_0_ID_UNRELEASED, org.apache.lucene.util.Version.LUCENE_6_4_1);
     public static final int V_6_0_0_alpha1_ID_UNRELEASED = 6000001;
     public static final Version V_6_0_0_alpha1_UNRELEASED =
-        new Version(V_6_0_0_alpha1_ID_UNRELEASED, org.apache.lucene.util.Version.LUCENE_6_4_0);
+        new Version(V_6_0_0_alpha1_ID_UNRELEASED, org.apache.lucene.util.Version.LUCENE_6_4_1);
     public static final Version CURRENT = V_6_0_0_alpha1_UNRELEASED;
 
     // unreleased versions must be added to the above list with the suffix _UNRELEASED (with the exception of CURRENT)
diff --git a/core/src/main/resources/org/elasticsearch/bootstrap/security.policy b/core/src/main/resources/org/elasticsearch/bootstrap/security.policy
index e93b1af8cc7..6e71f6a46c3 100644
--- a/core/src/main/resources/org/elasticsearch/bootstrap/security.policy
+++ b/core/src/main/resources/org/elasticsearch/bootstrap/security.policy
@@ -31,7 +31,7 @@ grant codeBase "${codebase.securesm-1.1.jar}" {
 //// Very special jar permissions:
 //// These are dangerous permissions that we don't want to grant to everything.
 
-grant codeBase "${codebase.lucene-core-6.4.0.jar}" {
+grant codeBase "${codebase.lucene-core-6.4.1.jar}" {
   // needed to allow MMapDirectory's "unmap hack" (die unmap hack, die)
   // java 8 package
   permission java.lang.RuntimePermission "accessClassInPackage.sun.misc";
@@ -42,7 +42,7 @@ grant codeBase "${codebase.lucene-core-6.4.0.jar}" {
   permission java.lang.RuntimePermission "accessDeclaredMembers";
 };
 
-grant codeBase "${codebase.lucene-misc-6.4.0.jar}" {
+grant codeBase "${codebase.lucene-misc-6.4.1.jar}" {
   // needed to allow shard shrinking to use hard-links if possible via lucenes HardlinkCopyDirectoryWrapper
   permission java.nio.file.LinkPermission "hard";
 };
diff --git a/core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy b/core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy
index ad43609d1c8..f96fb685a26 100644
--- a/core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy
+++ b/core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy
@@ -33,7 +33,7 @@ grant codeBase "${codebase.securemock-1.2.jar}" {
   permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
 };
 
-grant codeBase "${codebase.lucene-test-framework-6.4.0.jar}" {
+grant codeBase "${codebase.lucene-test-framework-6.4.1.jar}" {
   // needed by RamUsageTester
   permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
   // needed for testing hardlinks in StoreRecoveryTests since we install MockFS
diff --git a/modules/lang-expression/licenses/lucene-expressions-6.4.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-6.4.0.jar.sha1
deleted file mode 100644
index b44295b0ad9..00000000000
--- a/modules/lang-expression/licenses/lucene-expressions-6.4.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-09a755871c89fec98d3ca8372f283c1639dcadaf
\ No newline at end of file
diff --git a/modules/lang-expression/licenses/lucene-expressions-6.4.1.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-6.4.1.jar.sha1
new file mode 100644
index 00000000000..b3ef2f5e9f7
--- /dev/null
+++ b/modules/lang-expression/licenses/lucene-expressions-6.4.1.jar.sha1
@@ -0,0 +1 @@
+d56305d2ee8b2484262b1704d802470e6d8f8a8f
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-6.4.0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-6.4.0.jar.sha1
deleted file mode 100644
index c5796663317..00000000000
--- a/plugins/analysis-icu/licenses/lucene-analyzers-icu-6.4.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0242cfe1a026ec3afd5a567237f634da1d95fa24
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-6.4.1.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-6.4.1.jar.sha1
new file mode 100644
index 00000000000..adbd64b0458
--- /dev/null
+++ b/plugins/analysis-icu/licenses/lucene-analyzers-icu-6.4.1.jar.sha1
@@ -0,0 +1 @@
+dae7aa1d7ccb6eaa32d7208d25fe772c029113bd
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-6.4.0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-6.4.0.jar.sha1
deleted file mode 100644
index b1974f267b4..00000000000
--- a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-6.4.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fdefb46dde0019b8173d19fe4b164dca9efcba14
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-6.4.1.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-6.4.1.jar.sha1
new file mode 100644
index 00000000000..31c61e712eb
--- /dev/null
+++ b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-6.4.1.jar.sha1
@@ -0,0 +1 @@
+8acb2fd78d2a4612d677e353b056c89fe700a73a
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-6.4.0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-6.4.0.jar.sha1
deleted file mode 100644
index 8d80c614fe1..00000000000
--- a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-6.4.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e75472bdbd3480ceddc570e747c70640429598d6
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-6.4.1.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-6.4.1.jar.sha1
new file mode 100644
index 00000000000..ea37b6ed38f
--- /dev/null
+++ b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-6.4.1.jar.sha1
@@ -0,0 +1 @@
+5f40ded59cc0a57d2a9fe9d9b9ff6d5dbdb319e6
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-6.4.0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-6.4.0.jar.sha1
deleted file mode 100644
index b9a56da53da..00000000000
--- a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-6.4.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-31ebae985b936c2dcbe16126492deccbb5192ce8
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-6.4.1.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-6.4.1.jar.sha1
new file mode 100644
index 00000000000..89a03e9fe0c
--- /dev/null
+++ b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-6.4.1.jar.sha1
@@ -0,0 +1 @@
+1aff866b1c191914301af25f818309f7ceb76cd3
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-6.4.0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-6.4.0.jar.sha1
deleted file mode 100644
index 373102540ea..00000000000
--- a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-6.4.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-684bc70e964bfb93224962b24912b1bab2a5b673
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-6.4.1.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-6.4.1.jar.sha1
new file mode 100644
index 00000000000..a3ee881dfd8
--- /dev/null
+++ b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-6.4.1.jar.sha1
@@ -0,0 +1 @@
+52fcba7d7abde7d299ba31b1c5194fca3b1625da
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-6.4.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-6.4.0.jar.sha1
deleted file mode 100644
index 7573eb01c88..00000000000
--- a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-6.4.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-07a2471f5da4a69be367851505338b53ceca0ef1
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-6.4.1.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-6.4.1.jar.sha1
new file mode 100644
index 00000000000..cbe0964ac66
--- /dev/null
+++ b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-6.4.1.jar.sha1
@@ -0,0 +1 @@
+405aeb0b03eca645434cbd23aed31bb74feaece8
\ No newline at end of file