diff --git a/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex b/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex
index 14a8996ab09a..118bed160cfb 100644
--- a/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex
+++ b/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex
@@ -13,7 +13,7 @@ import java.util.EnumSet;
 
 %class _RegExLexer
 %implements FlexLexer
-%unicode
+%unicode 2.0
 %function advance
 %type IElementType
 
diff --git a/java/java-impl/src/com/intellij/spi/parsing/_SPILexer.flex b/java/java-impl/src/com/intellij/spi/parsing/_SPILexer.flex
index aa321e900d47..0c340c01e5c0 100644
--- a/java/java-impl/src/com/intellij/spi/parsing/_SPILexer.flex
+++ b/java/java-impl/src/com/intellij/spi/parsing/_SPILexer.flex
@@ -29,7 +29,7 @@ import com.intellij.lexer.FlexLexer;
   }
 %}
 
-%unicode
+%unicode 2.0
 %class _SPILexer
 %implements FlexLexer
 %function advance
diff --git a/java/java-psi-impl/src/com/intellij/lang/java/lexer/_JavaDocLexer.flex b/java/java-psi-impl/src/com/intellij/lang/java/lexer/_JavaDocLexer.flex
index d69efd67cc30..b130391177aa 100644
--- a/java/java-psi-impl/src/com/intellij/lang/java/lexer/_JavaDocLexer.flex
+++ b/java/java-psi-impl/src/com/intellij/lang/java/lexer/_JavaDocLexer.flex
@@ -31,11 +31,9 @@ import com.intellij.psi.tree.IElementType;
 
 %class _JavaDocLexer
 %implements FlexLexer
-%unicode
+%unicode 2.0
 %function advance
 %type IElementType
-%eof{ return;
-%eof}
 
 %state COMMENT_DATA_START
 %state COMMENT_DATA
diff --git a/java/java-psi-impl/src/com/intellij/lang/java/lexer/_JavaLexer.flex b/java/java-psi-impl/src/com/intellij/lang/java/lexer/_JavaLexer.flex
index d3d5d414ba9c..d21832285acd 100644
--- a/java/java-psi-impl/src/com/intellij/lang/java/lexer/_JavaLexer.flex
+++ b/java/java-psi-impl/src/com/intellij/lang/java/lexer/_JavaLexer.flex
@@ -40,7 +40,7 @@ import com.intellij.lexer.FlexLexer;
   }
 %}
 
-%unicode
+%unicode 2.0
 %class _JavaLexer
 %implements FlexLexer
 %function advance
diff --git a/json/gen/com/intellij/json/_JsonLexer.flex b/json/gen/com/intellij/json/_JsonLexer.flex
index 7bcfc6015e1e..16c558cd5dc3 100644
--- a/json/gen/com/intellij/json/_JsonLexer.flex
+++ b/json/gen/com/intellij/json/_JsonLexer.flex
@@ -16,7 +16,7 @@ import static com.intellij.json.JsonElementTypes.*;
 %implements FlexLexer
 %function advance
 %type IElementType
-%unicode
+%unicode 2.0
 
 EOL="\r"|"\n"|"\r\n"
 LINE_WS=[\ \t\f]
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateTextLexer.flex b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateTextLexer.flex
index cbcb3b50b218..eaf2ef6f229c 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateTextLexer.flex
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateTextLexer.flex
@@ -12,13 +12,11 @@ import com.intellij.psi.tree.IElementType;
    }
 %}
 
-%unicode
+%unicode 2.0
 %class _TemplateTextLexer
 %implements FlexLexer
 %function advance
 %type IElementType
-%eof{  return;
-%eof}
 
 ALPHA=[A-Za-z_]
 DIGIT=[0-9]
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/_MacroLexer.flex b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/_MacroLexer.flex
index 10acab23c7fe..6f67b0143932 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/_MacroLexer.flex
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/_MacroLexer.flex
@@ -13,7 +13,7 @@ import com.intellij.lexer.FlexLexer;
    }
 %}
 
-%unicode
+%unicode 2.0
 %class _MacroLexer
 %implements FlexLexer
 %function advance
diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateTextLexer.flex b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateTextLexer.flex
index 9491026c617e..5186dc3e9b41 100644
--- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateTextLexer.flex
+++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateTextLexer.flex
@@ -12,13 +12,11 @@ import com.intellij.psi.tree.IElementType;
    }
 %}
 
-%unicode
+%unicode 2.0
 %class _FileTemplateTextLexer
 %implements FlexLexer
 %function advance
 %type IElementType
-%eof{  return;
-%eof}
 
 ALPHA=[A-Za-z_]
 DIGIT=[0-9]
diff --git a/platform/lang-impl/src/com/intellij/psi/search/scope/packageSet/lexer/_ScopesLexer.flex b/platform/lang-impl/src/com/intellij/psi/search/scope/packageSet/lexer/_ScopesLexer.flex
index 7f49ec9869e6..baa32ca5a939 100644
--- a/platform/lang-impl/src/com/intellij/psi/search/scope/packageSet/lexer/_ScopesLexer.flex
+++ b/platform/lang-impl/src/com/intellij/psi/search/scope/packageSet/lexer/_ScopesLexer.flex
@@ -11,7 +11,7 @@ import com.intellij.lexer.FlexLexer;
   }
 %}
 
-%unicode
+%unicode 2.0
 %class _ScopesLexer
 %implements FlexLexer
 %function advance
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/lexer/gdoc.flex b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/lexer/gdoc.flex
index 3580179b1bcf..3fe41f926aed 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/lexer/gdoc.flex
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/lexer/gdoc.flex
@@ -23,15 +23,12 @@ import com.intellij.psi.tree.IElementType;
 
 %class _GroovyDocLexer
 %implements FlexLexer
-%unicode
+%unicode 2.0
 %public
 
 %function advance
 %type IElementType
 
-%eof{ return;
-%eof}
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 /////////////////////// User code //////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/lexer/groovy.flex b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/lexer/groovy.flex
index 21d90886def2..b501346d830e 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/lexer/groovy.flex
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/lexer/groovy.flex
@@ -25,15 +25,12 @@ import org.jetbrains.plugins.groovy.lang.groovydoc.parser.GroovyDocElementTypes;
 
 %class _GroovyLexer
 %implements FlexLexer
-%unicode
+%unicode 2.0
 %public
 
 %function advance
 %type IElementType
 
-%eof{ return;
-%eof}
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 /////////////////////// User code //////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/properties/src/com/intellij/lang/properties/parsing/Properties.flex b/plugins/properties/src/com/intellij/lang/properties/parsing/Properties.flex
index eeb6944d3476..13193065e94a 100644
--- a/plugins/properties/src/com/intellij/lang/properties/parsing/Properties.flex
+++ b/plugins/properties/src/com/intellij/lang/properties/parsing/Properties.flex
@@ -7,7 +7,7 @@ import com.intellij.psi.tree.IElementType;
 
 %class _PropertiesLexer
 %implements FlexLexer
-%unicode
+%unicode 2.0
 %function advance
 %type IElementType
 
diff --git a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/jql/JqlLexer.flex b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/jql/JqlLexer.flex
index 7cbca11161ad..0b20229e8454 100644
--- a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/jql/JqlLexer.flex
+++ b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/jql/JqlLexer.flex
@@ -7,12 +7,10 @@ import com.intellij.psi.tree.IElementType;
 
 %class _JqlLexer
 %implements FlexLexer
-%unicode
+%unicode 2.0
 %function advance
 %type IElementType
 %ignorecase
-%eof{  return;
-%eof}
 
 WHITESPACE_CHAR = [\ \t]
 DIGIT = [0-9]
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xpath-lexer.flex b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xpath-lexer.flex
index e1d1e41907b7..2c8f8c84e4bf 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xpath-lexer.flex
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xpath-lexer.flex
@@ -10,7 +10,7 @@ import com.intellij.psi.tree.IElementType;
 %class _XPathLexer
 %abstract
 %implements FlexLexer
-%unicode
+%unicode 2.0
 %function advance
 %type IElementType
 
diff --git a/plugins/yaml/src/org/jetbrains/yaml/lexer/yaml.flex b/plugins/yaml/src/org/jetbrains/yaml/lexer/yaml.flex
index dd5e41534caf..5d6002332da9 100644
--- a/plugins/yaml/src/org/jetbrains/yaml/lexer/yaml.flex
+++ b/plugins/yaml/src/org/jetbrains/yaml/lexer/yaml.flex
@@ -9,15 +9,12 @@ import org.jetbrains.yaml.YAMLTokenTypes;
 
 %class _YAMLLexer
 %implements FlexLexer, YAMLTokenTypes
-%unicode
+%unicode 2.0
 %public
 
 %function advance
 %type IElementType
 
-%eof{ return;
-%eof}
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 /////////////////////// USER CODE //////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/python/gen/com/jetbrains/commandInterface/commandLine/_CommandLineLexer.flex b/python/gen/com/jetbrains/commandInterface/commandLine/_CommandLineLexer.flex
index e9082f578d30..1918a0b8dfae 100644
--- a/python/gen/com/jetbrains/commandInterface/commandLine/_CommandLineLexer.flex
+++ b/python/gen/com/jetbrains/commandInterface/commandLine/_CommandLineLexer.flex
@@ -16,7 +16,7 @@ import static com.jetbrains.commandInterface.commandLine.CommandLineElementTypes
 %implements FlexLexer
 %function advance
 %type IElementType
-%unicode
+%unicode 2.0
 
 EOL="\r"|"\n"|"\r\n"
 LINE_WS=[\ \t\f]
diff --git a/python/rest/src/com/jetbrains/rest/lexer/rest.flex b/python/rest/src/com/jetbrains/rest/lexer/rest.flex
index f61c1f5e0ef5..d5f5ab015a07 100644
--- a/python/rest/src/com/jetbrains/rest/lexer/rest.flex
+++ b/python/rest/src/com/jetbrains/rest/lexer/rest.flex
@@ -9,7 +9,7 @@ import com.jetbrains.rest.RestTokenTypes;
 
 %class _RestFlexLexer
 %implements FlexLexer, RestTokenTypes
-%unicode
+%unicode 2.0
 %public
 %ignorecase
 %function advance
diff --git a/python/src/com/jetbrains/python/buildout/config/lexer/buildout.cfg.flex b/python/src/com/jetbrains/python/buildout/config/lexer/buildout.cfg.flex
index 372b5cd7cca0..24bdd0c26711 100644
--- a/python/src/com/jetbrains/python/buildout/config/lexer/buildout.cfg.flex
+++ b/python/src/com/jetbrains/python/buildout/config/lexer/buildout.cfg.flex
@@ -9,17 +9,12 @@ import com.jetbrains.python.buildout.config.BuildoutCfgTokenTypes;
 
 %class _BuildoutCfgFlexLexer
 %implements FlexLexer, BuildoutCfgTokenTypes
-%unicode
+%unicode 2.0
 %public
 
 %function advance
 %type IElementType
 
-%eof{ return;
-%eof}
-
-
-
 CRLF= \n|\r|\r\n
 SPACE=[\ \t]
 NOTSPACE=[^\ \t]
diff --git a/python/src/com/jetbrains/python/lexer/Python.flex b/python/src/com/jetbrains/python/lexer/Python.flex
index 64a233e2a586..a0db82016513 100644
--- a/python/src/com/jetbrains/python/lexer/Python.flex
+++ b/python/src/com/jetbrains/python/lexer/Python.flex
@@ -10,11 +10,9 @@ import com.intellij.openapi.util.text.StringUtil;
 
 %class _PythonLexer
 %implements FlexLexer
-%unicode
+%unicode 2.0
 %function advance
 %type IElementType
-%eof{  return;
-%eof}
 
 DIGIT = [0-9]
 NONZERODIGIT = [1-9]
diff --git a/python/src/com/jetbrains/python/psi/types/PyType.flex b/python/src/com/jetbrains/python/psi/types/PyType.flex
index 0e4194906ed6..1cadfa47a28a 100644
--- a/python/src/com/jetbrains/python/psi/types/PyType.flex
+++ b/python/src/com/jetbrains/python/psi/types/PyType.flex
@@ -10,7 +10,7 @@ import static com.jetbrains.python.psi.types.PyTypeTokenTypes.*;
 
 %class _PyTypeLexer
 %implements FlexLexer
-%unicode
+%unicode 2.0
 %public
 
 %function advance
diff --git a/xml/xml-psi-impl/src/com/intellij/lexer/_DtdLexer.flex b/xml/xml-psi-impl/src/com/intellij/lexer/_DtdLexer.flex
index 0869996e5e6e..0fc77f6cc997 100644
--- a/xml/xml-psi-impl/src/com/intellij/lexer/_DtdLexer.flex
+++ b/xml/xml-psi-impl/src/com/intellij/lexer/_DtdLexer.flex
@@ -16,14 +16,12 @@ import com.intellij.psi.xml.*;
    }
 %}
 
-%unicode
+%unicode 2.0
 %class _DtdLexer
 %public
 %implements FlexLexer
 %function advance
 %type IElementType
-%eof{  return;
-%eof}
 
 %state DECL
 %state DECL_ATTR
diff --git a/xml/xml-psi-impl/src/com/intellij/lexer/_HtmlLexer.flex b/xml/xml-psi-impl/src/com/intellij/lexer/_HtmlLexer.flex
index 028bf0db97b1..c4a359c6a6a6 100644
--- a/xml/xml-psi-impl/src/com/intellij/lexer/_HtmlLexer.flex
+++ b/xml/xml-psi-impl/src/com/intellij/lexer/_HtmlLexer.flex
@@ -7,7 +7,7 @@ import com.intellij.psi.xml.*;
 
 %%
 
-%unicode
+%unicode 2.0
 
 %{
   public _HtmlLexer() {
diff --git a/xml/xml-psi-impl/src/com/intellij/lexer/_XmlLexer.flex b/xml/xml-psi-impl/src/com/intellij/lexer/_XmlLexer.flex
index cd72a3a4423e..ca32a3d8e422 100644
--- a/xml/xml-psi-impl/src/com/intellij/lexer/_XmlLexer.flex
+++ b/xml/xml-psi-impl/src/com/intellij/lexer/_XmlLexer.flex
@@ -43,7 +43,7 @@ import com.intellij.psi.xml.*;
   }
 %}
 
-%unicode
+%unicode 2.0
 %class __XmlLexer
 %public
 %implements FlexLexer