diff --git a/java/openapi/src/com/intellij/lexer/JavaDocLexer.java b/java/openapi/src/com/intellij/lexer/JavaDocLexer.java
index 355e2432737b..6efb4ab16cce 100644
--- a/java/openapi/src/com/intellij/lexer/JavaDocLexer.java
+++ b/java/openapi/src/com/intellij/lexer/JavaDocLexer.java
@@ -20,6 +20,6 @@ package com.intellij.lexer;
  */
 public class JavaDocLexer extends DocCommentLexer {
   public JavaDocLexer(final boolean isJdk15Enabled) {
-    super(new JavaDocTokenTypes(), isJdk15Enabled);
+    super(JavaDocTokenTypes.INSTANCE, isJdk15Enabled);
   }
 }
diff --git a/java/openapi/src/com/intellij/lexer/JavaDocTokenTypes.java b/java/openapi/src/com/intellij/lexer/JavaDocTokenTypes.java
index 732a16bba737..b99d7da89bd6 100644
--- a/java/openapi/src/com/intellij/lexer/JavaDocTokenTypes.java
+++ b/java/openapi/src/com/intellij/lexer/JavaDocTokenTypes.java
@@ -22,6 +22,10 @@ import com.intellij.psi.tree.IElementType;
  * @author yole
  */
 public class JavaDocTokenTypes implements DocCommentTokenTypes {
+  public static final DocCommentTokenTypes INSTANCE = new JavaDocTokenTypes();
+
+  private JavaDocTokenTypes() { }
+
   public IElementType commentStart() {
     return JavaDocTokenType.DOC_COMMENT_START;
   }