diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/global/global inspections b/plugins/InspectionGadgets/global inspections.txt
similarity index 100%
rename from plugins/InspectionGadgets/src/com/siyeh/ig/global/global inspections
rename to plugins/InspectionGadgets/global inspections.txt
diff --git a/plugins/InspectionGadgets/src/com/siyeh/InspectionGadgetsBundle.properties b/plugins/InspectionGadgets/src/com/siyeh/InspectionGadgetsBundle.properties
index 61b790ef9397..e6ec03c40af3 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/InspectionGadgetsBundle.properties
+++ b/plugins/InspectionGadgets/src/com/siyeh/InspectionGadgetsBundle.properties
@@ -1524,9 +1524,10 @@ package.in.multiple.modules.display.name=Package with classes in multiple module
 package.in.multiple.modules.problem.descriptor=Package {0} has classes in multiple modules #loc
 disjoint.package.display.name=Package with disjoint dependency graph
 disjoint.package.problem.descriptor=Package {0} can be decomposed into {1} independent packages #loc
-package.naming.convention.problem.descriptor.short=Package name <code>{0}</code> is too short #loc
-package.naming.convention.problem.descriptor.long=Package name <code>{0}</code> is too long #loc
-package.naming.convention.problem.descriptor.regex.mismatch=Package name <code>{0}</code> doesn''t match regex ''{1}'' #loc
+package.naming.convention.display.name=Package naming convention
+package.naming.convention.problem.descriptor.short=Package name <code>{0}</code> is too short
+package.naming.convention.problem.descriptor.long=Package name <code>{0}</code> is too long
+package.naming.convention.problem.descriptor.regex.mismatch=Package name <code>{0}</code> doesn''t match regex ''{1}''
 cyclic.class.initialization.display.name=Cyclic class initialization dependency
 cyclic.class.initialization.problem.descriptor=Initialization of class {0} is cyclically dependent on {1} other classes #loc
 before.or.after.is.public.void.no.arg.display.name=Malformed @Before or @After method
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/InspectionGadgetsPlugin.java b/plugins/InspectionGadgets/src/com/siyeh/ig/InspectionGadgetsPlugin.java
index 6f4613abb8c6..4ea796f948e7 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/InspectionGadgetsPlugin.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/InspectionGadgetsPlugin.java
@@ -456,7 +456,7 @@ public class InspectionGadgetsPlugin implements ApplicationComponent,
         m_inspectionClasses.add(NonExceptionNameEndsWithExceptionInspection.class);
         m_inspectionClasses.add(OverloadedMethodsWithSameNumberOfParametersInspection.class);
         m_inspectionClasses.add(OverloadedVarargsMethodInspection.class);
-//        m_inspectionClasses.add(PackageNamingConventionInspection.class);
+        m_inspectionClasses.add(PackageNamingConventionInspection.class);
         m_inspectionClasses.add(ParameterNameDiffersFromOverriddenParameterInspection.class);
         m_inspectionClasses.add(ParameterNamingConventionInspection.class);
         m_inspectionClasses.add(QuestionableNameInspection.class);
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/PackageNamingConventionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/PackageNamingConventionInspection.java
index c3bdb8b0a187..8e03ca8098cf 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/PackageNamingConventionInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/PackageNamingConventionInspection.java
@@ -75,8 +75,8 @@ public class PackageNamingConventionInspection extends BaseGlobalInspection {
         if (!(refEntity instanceof RefPackage)) {
             return null;
         }
-        final String name = refEntity.getName();
-        if (name == null) {
+        @NonNls final String name = refEntity.getName();
+        if (name == null || "default package".equals(name)) {
             return null;
         }
 
diff --git a/plugins/InspectionGadgets/src/inspectionDescriptions/PackageNamingConvention.html b/plugins/InspectionGadgets/src/inspectionDescriptions/PackageNamingConvention.html
new file mode 100644
index 000000000000..221cacbb6427
--- /dev/null
+++ b/plugins/InspectionGadgets/src/inspectionDescriptions/PackageNamingConvention.html
@@ -0,0 +1,11 @@
+<html>
+<body>
+This global inspection reports packages whose names are either too short, too long, or do not follow
+the specified regular expression pattern. Since this inspection requires global code analysis, it is only available in batch inspection mode.
+<p>
+Use the fields provided below to specify minimum length, maximum length and regular expression expected for method parameter names
+(Regular expressions are in standard <b>java.util.regex</b> format).
+<p>
+<small>New in 11, Powered by InspectionGadgets</small>
+</body>
+</html>
\ No newline at end of file