diff --git a/pmd-jbuilder/PMDOpenTool.jpx.local b/pmd-jbuilder/PMDOpenTool.jpx.local
index 805158aa00..fcad2ac3e6 100644
--- a/pmd-jbuilder/PMDOpenTool.jpx.local
+++ b/pmd-jbuilder/PMDOpenTool.jpx.local
@@ -26,10 +26,10 @@ debug.NoTracingClasses.7[0]=17 com.borland.sql.*1  1 -1
 debug.NoTracingClasses.8[0]=9  com.sun.*1  1 -1
 debug.NoTracingClasses.9[0]=6  java.*1  1 -1
 editor.search.file_filter_history.1[0]=*.java
-history.files.active[0]=src/net/sourceforge/pmd/jbuilder/AcceleratorPropertyGroup.java
-history.files.open.1[0]=src/net/sourceforge/pmd/jbuilder/AcceleratorPropertyGroup.java,F;0,590
-history.files.open.2[0]=src/net/sourceforge/pmd/jbuilder/ConfigureRuleSetPropertyPage.java,F;190,7921
-history.files.open.3[0]=src/net/sourceforge/pmd/jbuilder/PMDOpenTool.java,F;443,20740
+history.files.active[0]=src/net/sourceforge/pmd/jbuilder/PMDOpenTool.java
+history.files.open.1[0]=src/net/sourceforge/pmd/jbuilder/AcceleratorPropertyGroup.java,F;17,1052
+history.files.open.2[0]=src/net/sourceforge/pmd/jbuilder/Constants.java,F;0,90
+history.files.open.3[0]=src/net/sourceforge/pmd/jbuilder/PMDOpenTool.java,F;296,13484
 import.optimize.packageprefixgroupings.1[0]=java
 import.optimize.packageprefixgroupings.2[0]=<blank line>
 import.optimize.packageprefixgroupings.3[0]=javax
diff --git a/pmd-jbuilder/lib/PMDOpenTool.jar b/pmd-jbuilder/lib/PMDOpenTool.jar
index fb00bb3cce..063407ae21 100644
Binary files a/pmd-jbuilder/lib/PMDOpenTool.jar and b/pmd-jbuilder/lib/PMDOpenTool.jar differ
diff --git a/pmd-jbuilder/src/net/sourceforge/pmd/jbuilder/PMDOpenTool.java b/pmd-jbuilder/src/net/sourceforge/pmd/jbuilder/PMDOpenTool.java
index cf565e9cab..49abb0535a 100644
--- a/pmd-jbuilder/src/net/sourceforge/pmd/jbuilder/PMDOpenTool.java
+++ b/pmd-jbuilder/src/net/sourceforge/pmd/jbuilder/PMDOpenTool.java
@@ -290,17 +290,25 @@ public class PMDOpenTool {
     //create the project menu action for running a PMD check against all the java files within the active project
     public static BrowserAction B_ACTION_PMDPackageCheck = new BrowserAction ("PMD Check Package", 'P', "Check all the java files in the selected package", IMAGE_CHECK_SELECTED_PACKAGE) {
         public void actionPerformed(Browser browser) {
+            browser.waitMessage("PMD Status", "Please wait while PMD checks the files in this package.");
             RuleSet rules = constructRuleSets();
             PackageNode node = (PackageNode)browser.getProjectView().getSelectedNode();
             pmdCheckPackage(node, rules);
+            browser.clearWaitMessages();
         }
 
     };
 
     //create the project menu action for running a PMD check against all the java files within the active project
     public static BrowserAction B_ACTION_CPDPackageCheck = new BrowserAction ("CPD Check Package", 'P', "Check all the java files in the selected package", IMAGE_CPD_SELECTED_PACKAGE) {
-        public void actionPerformed(Browser browser) {
-            pmdCPD((PackageNode)browser.getProjectView().getSelectedNode());
+        public void actionPerformed(final Browser browser) {
+            Runnable r = new Runnable() {
+                public void run() {
+                    pmdCPD((PackageNode)browser.getProjectView().getSelectedNode());
+                }
+            };
+            Thread t = new Thread(r);
+            t.start();
         }
 
     };