diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/lexer/groovy.skeleton b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/lexer/groovy.skeleton
index 83fa26c4f265..607494bd61bb 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/lexer/groovy.skeleton
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/lexer/groovy.skeleton
@@ -205,7 +205,6 @@
     int zzMarkedPosL;
     int zzEndReadL = zzEndRead;
     CharSequence zzBufferL = zzBuffer;
-    char [] zzCMapL = ZZ_CMAP;
 
 --- local declarations
 
diff --git a/tools/lexer/CHANGES b/tools/lexer/CHANGES
index 3bc29c605ad4..d853424c5551 100644
--- a/tools/lexer/CHANGES
+++ b/tools/lexer/CHANGES
@@ -8,4 +8,6 @@ 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[]
-2. Emitter.java: try using reduced ZZ_CMAP if maxCodePoint is greater than 0xffff
\ No newline at end of file
+2. Emitter.java: reworked ZZ_CMAP to an optimized multi-level table (see java.lang.CharacterDataXX)
+   For this purpose EmitterCM.java is introduced to resemble a variant of
+   generatecharacter/GenerateCharacter.java from http://hg.openjdk.java.net tailored to our needs.
\ No newline at end of file
diff --git a/tools/lexer/idea-flex.skeleton b/tools/lexer/idea-flex.skeleton
index f3127cd8e8be..2f2563672f9a 100644
--- a/tools/lexer/idea-flex.skeleton
+++ b/tools/lexer/idea-flex.skeleton
@@ -201,7 +201,6 @@
     int zzMarkedPosL;
     int zzEndReadL = zzEndRead;
     CharSequence zzBufferL = zzBuffer;
-    char [] zzCMapL = ZZ_CMAP;
 
 --- local declarations
 
diff --git a/tools/lexer/jflex-1.7.0-SNAPSHOT.jar b/tools/lexer/jflex-1.7.0-SNAPSHOT.jar
index 4f301defd919..15cd90feaa58 100644
Binary files a/tools/lexer/jflex-1.7.0-SNAPSHOT.jar and b/tools/lexer/jflex-1.7.0-SNAPSHOT.jar differ