diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/DeclarationCollector.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/DeclarationCollector.java
index 9e761de04..a2fa3057b 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/DeclarationCollector.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/DeclarationCollector.java
@@ -53,7 +53,10 @@ public abstract class DeclarationCollector extends Check
             this.mFrames.current().addName(nameAST.getText());
             break;
         }
-        case TokenTypes.CLASS_DEF : {
+        case TokenTypes.CLASS_DEF :
+        case TokenTypes.INTERFACE_DEF :
+        case TokenTypes.ENUM_DEF :
+        case TokenTypes.ANNOTATION_DEF : {
             final DetailAST nameAST = aAST.findFirstToken(TokenTypes.IDENT);
             this.mFrames.current().addName(nameAST.getText());
             this.mFrames.enter(new ClassFrame());
diff --git a/src/xdocs/releasenotes.xml b/src/xdocs/releasenotes.xml
index 157891cd6..38b79df4c 100755
--- a/src/xdocs/releasenotes.xml
+++ b/src/xdocs/releasenotes.xml
@@ -23,6 +23,9 @@
 
           <li>Fixed bug #1098126 in UnusedImport check.</li>
 
+          <li>Fixed bug #1185722 (DeclarationCollector.leaveToken unbalanced
+          with visitToken)</li>
+
       </ul>
 
     </section>