diff --git a/java/java-psi-impl/src/com/intellij/codeInsight/javadoc/JavaDocUtil.java b/java/java-psi-impl/src/com/intellij/codeInsight/javadoc/JavaDocUtil.java
index 5b782423d6b2..f4376e734436 100644
--- a/java/java-psi-impl/src/com/intellij/codeInsight/javadoc/JavaDocUtil.java
+++ b/java/java-psi-impl/src/com/intellij/codeInsight/javadoc/JavaDocUtil.java
@@ -364,14 +364,6 @@ public class JavaDocUtil {
   }
 
   public static boolean isInsidePackageInfo(@Nullable PsiDocComment containingComment) {
-    if (containingComment == null || containingComment.getOwner() != null) {
-      return false;
-    }
-    final PsiElement parent = containingComment.getParent();
-    if (!(parent instanceof PsiJavaFile)) {
-      return false;
-    }
-    final PsiJavaFile file = (PsiJavaFile)parent;
-    return "package-info.java".equals(file.getName());
+    return containingComment != null && containingComment.getOwner() == null && containingComment.getParent() instanceof PsiJavaFile;
   }
 }
diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/DanglingJavadocInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/DanglingJavadocInspection.java
index 3476ac500bff..89ef1151856d 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/DanglingJavadocInspection.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/DanglingJavadocInspection.java
@@ -133,7 +133,8 @@ public class DanglingJavadocInspection extends BaseInspection {
         return;
       }
       if (JavaDocUtil.isInsidePackageInfo(comment) &&
-          PsiTreeUtil.skipSiblingsForward(comment, PsiWhiteSpace.class) instanceof PsiPackageStatement) {
+          PsiTreeUtil.skipSiblingsForward(comment, PsiWhiteSpace.class) instanceof PsiPackageStatement &&
+          "package-info.java".equals(comment.getContainingFile().getName())) {
         return;
       }
       registerError(comment.getFirstChild());