diff --git a/tools/lexer/CHANGES b/tools/lexer/CHANGES
index 80ee5d926bf3..3bc29c605ad4 100644
--- a/tools/lexer/CHANGES
+++ b/tools/lexer/CHANGES
@@ -7,4 +7,5 @@ Original JFlex revision
 https://github.com/jflex-de/jflex/tree/de2312d6891de7fdf2752ad8e0a45983202ad5e0
 "Return exit code 0 for --{help,version,info}" committed on Feb 29 by lsf37
 
-1. Emitter.java: zzBufferL is treated as CharSequence instead of char[]
\ No newline at end of file
+1. Emitter.java: zzBufferL is treated as CharSequence instead of char[]
+2. Emitter.java: try using reduced ZZ_CMAP if maxCodePoint is greater than 0xffff
\ No newline at end of file
diff --git a/tools/lexer/jflex-1.7.0-SNAPSHOT.jar b/tools/lexer/jflex-1.7.0-SNAPSHOT.jar
index 9f98b1eb664a..4f301defd919 100644
Binary files a/tools/lexer/jflex-1.7.0-SNAPSHOT.jar and b/tools/lexer/jflex-1.7.0-SNAPSHOT.jar differ