diff --git a/pmd/etc/bug_closer.txt b/pmd/etc/bug_closer.txt
index a27cf2cb7f..f1e0303284 100644
--- a/pmd/etc/bug_closer.txt
+++ b/pmd/etc/bug_closer.txt
@@ -1,10 +1,10 @@
-Fixed in CVS, and you can download a new pmd-3.8.jar file here:
+Fixed in CVS, and if you hit this page again:
 
-http://infoether.com/~tom/pmd-3.8.jar
+http://pmd.sf.net/cpd.html
 
-that contains that fix.
+you'll get an updated version that includes this fix.
 
 Thanks,
 
-Tom                  
+Tom
 The PMD book for $20: http://pmdapplied.com/
diff --git a/pmd/etc/changelog.txt b/pmd/etc/changelog.txt
index d8885ffc5c..30df3951fc 100644
--- a/pmd/etc/changelog.txt
+++ b/pmd/etc/changelog.txt
@@ -16,6 +16,7 @@ Fixed bug 1579615 - OverrideBothEqualsAndHashcode no longer throws an Exception
 Fixed bug 1580859 - AvoidDecimalLiteralsInBigDecimalConstructor now catches more cases.
 Fixed bug 1581123 - False +: UnnecessaryWrapperObjectCreation.
 Fixed bug 1592710 - VariableNamingConventions no longer reports false positives on certain enum declarations.
+Fixed bug 1593292 - The CPD GUI now works with the 'by extension' option selected.
 Applied patch 1551189 - SingularField false + for initialization blocks
 Applied patch 1573981 - false + in CloneMethodMustImplementCloneable
 Applied patch 1574988 - false + in OverrideBothEqualsAndHashcode
diff --git a/pmd/src/net/sourceforge/pmd/ast/ASTEnumElement.java b/pmd/src/net/sourceforge/pmd/ast/ASTEnumElement.java
index d3cc968656..37de8fcfd2 100644
--- a/pmd/src/net/sourceforge/pmd/ast/ASTEnumElement.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTEnumElement.java
@@ -11,7 +11,6 @@ public class ASTEnumElement extends SimpleJavaNode {
         super(p, id);
     }
 
-
     /**
      * Accept the visitor. *
      */
diff --git a/pmd/src/net/sourceforge/pmd/ast/ASTSingleMemberAnnotation.java b/pmd/src/net/sourceforge/pmd/ast/ASTSingleMemberAnnotation.java
index dfc89b6dde..2977c74cd2 100644
--- a/pmd/src/net/sourceforge/pmd/ast/ASTSingleMemberAnnotation.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTSingleMemberAnnotation.java
@@ -2,7 +2,6 @@
 
 package net.sourceforge.pmd.ast;
 
-
 public class ASTSingleMemberAnnotation extends SimpleJavaNode {
     public ASTSingleMemberAnnotation(int id) {
         super(id);
diff --git a/pmd/src/net/sourceforge/pmd/cpd/GUI.java b/pmd/src/net/sourceforge/pmd/cpd/GUI.java
index 874bbc0d77..a4e2be3829 100644
--- a/pmd/src/net/sourceforge/pmd/cpd/GUI.java
+++ b/pmd/src/net/sourceforge/pmd/cpd/GUI.java
@@ -456,7 +456,7 @@ public class GUI implements CPDListener {
     private boolean isLegalPath(String path, LanguageConfig config) {
     	String[] extensions = config.extensions();
     	for (int i=0; i<extensions.length; i++) {
-    		if (path.endsWith(extensions[i])) return true;
+    		if (path.endsWith(extensions[i]) && extensions[i].length() > 0) return true;
     	}
     	return false;
     }
diff --git a/pmd/xdocs/credits.xml b/pmd/xdocs/credits.xml
index 06e75c2b72..ee3c85eb95 100644
--- a/pmd/xdocs/credits.xml
+++ b/pmd/xdocs/credits.xml
@@ -54,6 +54,7 @@
         </subsection>
         <subsection name="Contributors">
         <ul>
+            <li>Harald Rohan - Reported bug in CPD GUIr</li>
             <li>classens - Noted missing varargs setting in ASTFormalParameter</li>
             <li>piair - Implemented StringBufferInstantiationWithChar, AvoidUsingOctalValues</li>
             <li>Christopher Eagan - Reported bug in VariableNamingConventions</li>