diff --git a/java/manifest/src/org/jetbrains/lang/manifest/header/impl/StandardManifestHeaderParsers.java b/java/manifest/src/org/jetbrains/lang/manifest/header/impl/StandardManifestHeaderParsers.java
index c6adcbb82a4a..8fe6ad580522 100644
--- a/java/manifest/src/org/jetbrains/lang/manifest/header/impl/StandardManifestHeaderParsers.java
+++ b/java/manifest/src/org/jetbrains/lang/manifest/header/impl/StandardManifestHeaderParsers.java
@@ -59,6 +59,12 @@ public class StandardManifestHeaderParsers implements HeaderParserProvider {
     myParsers.put("MD5-Digest", StandardHeaderParser.INSTANCE);
     myParsers.put("SHA-Digest", StandardHeaderParser.INSTANCE);
     myParsers.put("Magic", StandardHeaderParser.INSTANCE);
+    myParsers.put("Premain-Class", ClassReferenceParser.INSTANCE);
+    myParsers.put("Agent-Class", ClassReferenceParser.INSTANCE);
+    myParsers.put("Boot-Class-Path", StandardHeaderParser.INSTANCE);
+    myParsers.put("Can-Redefine-Classes", StandardHeaderParser.INSTANCE);
+    myParsers.put("Can-Retransform-Classes", StandardHeaderParser.INSTANCE);
+    myParsers.put("Can-Set-Native-Method-Prefix", StandardHeaderParser.INSTANCE);
   }
 
   @NotNull
diff --git a/java/manifest/src/org/jetbrains/lang/manifest/parser/ManifestParser.java b/java/manifest/src/org/jetbrains/lang/manifest/parser/ManifestParser.java
index e27314e2e71e..7b555f51594a 100644
--- a/java/manifest/src/org/jetbrains/lang/manifest/parser/ManifestParser.java
+++ b/java/manifest/src/org/jetbrains/lang/manifest/parser/ManifestParser.java
@@ -56,7 +56,7 @@ public class ManifestParser implements PsiParser {
 
   @NotNull
   @Override
-  public ASTNode parse(IElementType root, PsiBuilder builder) {
+  public ASTNode parse(@NotNull IElementType root, @NotNull PsiBuilder builder) {
     builder.setDebugMode(ApplicationManager.getApplication().isUnitTestMode());
 
     PsiBuilder.Marker rootMarker = builder.mark();