diff --git a/platform/core-api/src/com/intellij/psi/tree/IElementType.java b/platform/core-api/src/com/intellij/psi/tree/IElementType.java
index b64d76112220..ed349f7ee449 100644
--- a/platform/core-api/src/com/intellij/psi/tree/IElementType.java
+++ b/platform/core-api/src/com/intellij/psi/tree/IElementType.java
@@ -51,7 +51,7 @@ public class IElementType {
   };
 
   public static final short FIRST_TOKEN_INDEX = 1;
-  public static final short MAX_INDEXED_TYPES = 15000;
+  public static final short MAX_INDEXED_TYPES = 20000;
 
   private static short ourCounter = FIRST_TOKEN_INDEX;
   private static IElementType[] ourRegistry = new IElementType[700];