diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.java
index dc454a6c4..cf7ec2a49 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.java
@@ -112,4 +112,19 @@ public abstract class AbstractFileSetCheck
             }
         }
     }
+
+    /**
+     * Returns the Message bundle name to use for this FileSetCheck.
+     * The default implementation uses the <code>messages</code> bundle
+     * in the same package as this FileSetCeck.
+     * @return the message bundle name
+     */
+    protected String getMessageBundle()
+    {
+        final String className = getClass().getName();
+        final int pkgEndIndex = className.lastIndexOf('.');
+        final String pkgName = className.substring(0, pkgEndIndex);
+        final String bundle = pkgName + ".messages";
+        return bundle;
+    }
 }
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/PackageHtmlCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/PackageHtmlCheck.java
index 4fb7a39bf..8e088c0bf 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/PackageHtmlCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/PackageHtmlCheck.java
@@ -68,10 +68,7 @@ public class PackageHtmlCheck extends AbstractFileSetCheck
             dispatcher.fireFileStarted(path);
             if (!packageHtml.exists()) {
                 LocalizedMessage[] errors = new LocalizedMessage[1];
-                final String className = getClass().getName();
-                final int pkgEndIndex = className.lastIndexOf('.');
-                final String pkgName = className.substring(0, pkgEndIndex);
-                final String bundle = pkgName + ".messages";
+                String bundle = getMessageBundle();
                 errors[0] = new LocalizedMessage(
                         0, bundle, "javadoc.packageHtml", null);
                 getMessageDispatcher().fireErrors(path, errors);
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java
index 8c4f1ef80..e0bab86aa 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java
@@ -189,10 +189,7 @@ public class TranslationCheck extends AbstractFileSetCheck
                 for (Iterator it = keysClone.iterator(); it.hasNext();) {
                     Object[] key = new Object[]{it.next()};
                     LocalizedMessage[] errors = new LocalizedMessage[1];
-                    final String className = getClass().getName();
-                    final int pkgEndIndex = className.lastIndexOf('.');
-                    final String pkgName = className.substring(0, pkgEndIndex);
-                    final String bundle = pkgName + ".messages";
+                    final String bundle = getMessageBundle();
                     errors[0] = new LocalizedMessage(
                             0, bundle, "translation.missingKey", key);
                     getMessageDispatcher().fireErrors(path, errors);