diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/PackageHtmlCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/PackageHtmlCheck.java
index c6a3428ea..11b97d8dc 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/PackageHtmlCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/PackageHtmlCheck.java
@@ -56,8 +56,10 @@ public class PackageHtmlCheck extends AbstractFileSetCheck
             dispatcher.fireFileStarted(path);
             if (!packageHtml.exists()) {
                 LocalizedMessage[] errors = new LocalizedMessage[1];
-                final String bundle =
-                    this.getClass().getPackage().getName() + ".messages";
+                final String className = getClass().getName();
+                final int pkgEndIndex = className.lastIndexOf('.');
+                final String pkgName = className.substring(0, pkgEndIndex);
+                final String bundle = pkgName + ".messages";
                 errors[0] = new LocalizedMessage(
                         0, bundle, "javadoc.packageHtml", null);
                 getMessageDispatcher().fireErrors(path, errors);