diff --git a/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex b/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex
index 118bed160cfb..14a8996ab09a 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 2.0
+%unicode
 %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 0c340c01e5c0..aa321e900d47 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 2.0
+%unicode
 %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 b130391177aa..b2a94e26f240 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,7 +31,7 @@ import com.intellij.psi.tree.IElementType;
 
 %class _JavaDocLexer
 %implements FlexLexer
-%unicode 2.0
+%unicode
 %function advance
 %type IElementType
 
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 d21832285acd..d3d5d414ba9c 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 2.0
+%unicode
 %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 16c558cd5dc3..7bcfc6015e1e 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 2.0
+%unicode
 
 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 eaf2ef6f229c..8ac52e32d3f4 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,7 +12,7 @@ import com.intellij.psi.tree.IElementType;
    }
 %}
 
-%unicode 2.0
+%unicode
 %class _TemplateTextLexer
 %implements FlexLexer
 %function advance
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 6f67b0143932..10acab23c7fe 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 2.0
+%unicode
 %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 5186dc3e9b41..7c821dfda71b 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,7 +12,7 @@ import com.intellij.psi.tree.IElementType;
    }
 %}
 
-%unicode 2.0
+%unicode
 %class _FileTemplateTextLexer
 %implements FlexLexer
 %function advance
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 baa32ca5a939..7f49ec9869e6 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 2.0
+%unicode
 %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 3fe41f926aed..b3c2afd7f7e9 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,7 +23,7 @@ import com.intellij.psi.tree.IElementType;
 
 %class _GroovyDocLexer
 %implements FlexLexer
-%unicode 2.0
+%unicode
 %public
 
 %function advance
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 b501346d830e..258459754c00 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,7 +25,7 @@ import org.jetbrains.plugins.groovy.lang.groovydoc.parser.GroovyDocElementTypes;
 
 %class _GroovyLexer
 %implements FlexLexer
-%unicode 2.0
+%unicode
 %public
 
 %function advance
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 13193065e94a..eeb6944d3476 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 2.0
+%unicode
 %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 0b20229e8454..851df5f049a3 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,7 +7,7 @@ import com.intellij.psi.tree.IElementType;
 
 %class _JqlLexer
 %implements FlexLexer
-%unicode 2.0
+%unicode
 %function advance
 %type IElementType
 %ignorecase
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 2c8f8c84e4bf..e1d1e41907b7 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 2.0
+%unicode
 %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 5d6002332da9..fd60feca7730 100644
--- a/plugins/yaml/src/org/jetbrains/yaml/lexer/yaml.flex
+++ b/plugins/yaml/src/org/jetbrains/yaml/lexer/yaml.flex
@@ -9,7 +9,7 @@ import org.jetbrains.yaml.YAMLTokenTypes;
 
 %class _YAMLLexer
 %implements FlexLexer, YAMLTokenTypes
-%unicode 2.0
+%unicode
 %public
 
 %function advance
diff --git a/python/gen/com/jetbrains/commandInterface/commandLine/_CommandLineLexer.flex b/python/gen/com/jetbrains/commandInterface/commandLine/_CommandLineLexer.flex
index 1918a0b8dfae..e9082f578d30 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 2.0
+%unicode
 
 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 d5f5ab015a07..f61c1f5e0ef5 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 2.0
+%unicode
 %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 24bdd0c26711..f0786bd81aef 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,7 +9,7 @@ import com.jetbrains.python.buildout.config.BuildoutCfgTokenTypes;
 
 %class _BuildoutCfgFlexLexer
 %implements FlexLexer, BuildoutCfgTokenTypes
-%unicode 2.0
+%unicode
 %public
 
 %function advance
diff --git a/python/src/com/jetbrains/python/lexer/Python.flex b/python/src/com/jetbrains/python/lexer/Python.flex
index a0db82016513..dfad1cd65ea0 100644
--- a/python/src/com/jetbrains/python/lexer/Python.flex
+++ b/python/src/com/jetbrains/python/lexer/Python.flex
@@ -10,7 +10,7 @@ import com.intellij.openapi.util.text.StringUtil;
 
 %class _PythonLexer
 %implements FlexLexer
-%unicode 2.0
+%unicode
 %function advance
 %type IElementType
 
diff --git a/python/src/com/jetbrains/python/psi/types/PyType.flex b/python/src/com/jetbrains/python/psi/types/PyType.flex
index 1cadfa47a28a..0e4194906ed6 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 2.0
+%unicode
 %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 0fc77f6cc997..83c899eaf9e5 100644
--- a/xml/xml-psi-impl/src/com/intellij/lexer/_DtdLexer.flex
+++ b/xml/xml-psi-impl/src/com/intellij/lexer/_DtdLexer.flex
@@ -16,7 +16,7 @@ import com.intellij.psi.xml.*;
    }
 %}
 
-%unicode 2.0
+%unicode
 %class _DtdLexer
 %public
 %implements FlexLexer
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 c4a359c6a6a6..028bf0db97b1 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 2.0
+%unicode
 
 %{
   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 ca32a3d8e422..cd72a3a4423e 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 2.0
+%unicode
 %class __XmlLexer
 %public
 %implements FlexLexer