diff --git a/java/java-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilder.java b/java/java-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilder.java
index d0cf979c2905..5809eb59a3d8 100644
--- a/java/java-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilder.java
+++ b/java/java-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilder.java
@@ -17,7 +17,7 @@ package com.intellij.codeInsight.folding.impl;
 
 import com.intellij.codeInsight.folding.JavaCodeFoldingSettings;
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.folding.FoldingBuilderEx;
+import com.intellij.lang.folding.CustomFoldingBuilder;
 import com.intellij.lang.folding.FoldingDescriptor;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Document;
@@ -47,25 +47,27 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
 
-public class JavaFoldingBuilder extends FoldingBuilderEx implements DumbAware {
+public class JavaFoldingBuilder extends CustomFoldingBuilder implements DumbAware {
   private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.folding.impl.JavaFoldingBuilder");
   private static final String SMILEY = "<~>";
 
-  @NotNull
-  public FoldingDescriptor[] buildFoldRegions(@NotNull PsiElement element, @NotNull Document document, boolean quick) {
-    if (!(element instanceof PsiJavaFile)) {
-      return FoldingDescriptor.EMPTY;
+  @Override
+  protected void buildLanguageFoldRegions(@NotNull List<FoldingDescriptor> descriptors,
+                                          @NotNull PsiElement root,
+                                          @NotNull Document document,
+                                          boolean quick) {
+    if (!(root instanceof PsiJavaFile)) {
+      return;
     }
-    PsiJavaFile file = (PsiJavaFile) element;
+    PsiJavaFile file = (PsiJavaFile) root;
 
-    List<FoldingDescriptor> result = new ArrayList<FoldingDescriptor>();
     PsiImportList importList = file.getImportList();
     if (importList != null) {
       PsiImportStatementBase[] statements = importList.getAllImportStatements();
       if (statements.length > 1) {
         final TextRange rangeToFold = getRangeToFold(importList);
         if (rangeToFold != null && rangeToFold.getLength() > 1) {
-          result.add(new FoldingDescriptor(importList, rangeToFold));
+          descriptors.add(new FoldingDescriptor(importList, rangeToFold));
         }
       }
     }
@@ -73,7 +75,7 @@ public class JavaFoldingBuilder extends FoldingBuilderEx implements DumbAware {
     PsiClass[] classes = file.getClasses();
     for (PsiClass aClass : classes) {
       ProgressManager.checkCanceled();
-      addElementsToFold(result, aClass, document, true, quick);
+      addElementsToFold(descriptors, aClass, document, true, quick);
     }
 
     TextRange range = getFileHeader(file);
@@ -94,10 +96,8 @@ public class JavaFoldingBuilder extends FoldingBuilderEx implements DumbAware {
           anchorElementToUse = candidate;
         }
       }
-      result.add(new FoldingDescriptor(anchorElementToUse, range));
+      descriptors.add(new FoldingDescriptor(anchorElementToUse, range));
     }
-
-    return result.toArray(new FoldingDescriptor[result.size()]);
   }
 
   private void addElementsToFold(List<FoldingDescriptor> list, PsiClass aClass, Document document, boolean foldJavaDocs, boolean quick) {
@@ -160,14 +160,14 @@ public class JavaFoldingBuilder extends FoldingBuilderEx implements DumbAware {
       else if (child instanceof PsiClass) {
         addElementsToFold(list, (PsiClass)child, document, true, quick);
       }
-      else if (child instanceof PsiComment) {
+      else if (child instanceof PsiComment && !isCustomRegionStart(child.getNode()) && !isCustomRegionEnd(child.getNode())) {
         addCommentFolds((PsiComment)child, processedComments, list);
       }
     }
   }
 
-  @NotNull
-  public String getPlaceholderText(@NotNull final ASTNode node) {
+  @Override
+  protected String getLanguagePlaceholderText(@NotNull ASTNode node, @NotNull TextRange range) {
     return getPlaceholderText(SourceTreeToPsiMap.treeElementToPsi(node));
   }
 
@@ -196,7 +196,8 @@ public class JavaFoldingBuilder extends FoldingBuilderEx implements DumbAware {
     return "...";
   }
 
-  public boolean isCollapsedByDefault(@NotNull final ASTNode node) {
+  @Override
+  protected boolean isRegionCollapsedByDefault(@NotNull ASTNode node) {
     final PsiElement element = SourceTreeToPsiMap.treeElementToPsi(node);
     JavaCodeFoldingSettings settings = JavaCodeFoldingSettings.getInstance();
     if (element instanceof PsiNewExpression || element instanceof PsiJavaToken) {
@@ -734,5 +735,10 @@ public class JavaFoldingBuilder extends FoldingBuilderEx implements DumbAware {
       return false;
     }
   }
+
+  @Override
+  protected boolean isCustomFoldingCandidate(ASTNode node) {
+    return node.getElementType() == JavaTokenType.END_OF_LINE_COMMENT;
+  }
 }
 
diff --git a/java/java-tests/testData/codeInsight/folding/CustomFolding.java b/java/java-tests/testData/codeInsight/folding/CustomFolding.java
new file mode 100644
index 000000000000..955b69ce9aa0
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/folding/CustomFolding.java
@@ -0,0 +1,19 @@
+public class Test {
+  <fold text='My private fields'>// <editor-fold desc="My private fields">
+
+  private int x;
+  private int y;
+  // </editor-fold></fold>
+
+  <fold text='My methods'>// <editor-fold desc="My methods">
+
+  private void doSomething() <fold text='{...}'>{
+    StringBuilder s = new StringBuilder();
+    <fold text='My code'>// <editor-fold desc="My code">
+    s.append("a");
+    s.append("b");
+    // </editor-fold></fold>
+    System.out.println(s.toString());
+  }</fold>
+  // </editor-fold></fold>
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/folding/JavaFoldingTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/folding/JavaFoldingTest.groovy
index 7c5c84e11a6d..5797be458246 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/folding/JavaFoldingTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/folding/JavaFoldingTest.groovy
@@ -133,6 +133,10 @@ class Test {
     assertTrue closureStartFold.expanded
     assertTrue closureEndFold.expanded
   }
+
+  public void testCustomFolding() {
+    myFixture.testFolding("$PathManagerEx.testDataPath/codeInsight/folding/${getTestName(false)}.java");
+  }
   
   private def configure(String text) {
     myFixture.configureByText("a.java", text)