diff --git a/pmd/etc/changelog.txt b/pmd/etc/changelog.txt
index db31ca9507..b75c555595 100644
--- a/pmd/etc/changelog.txt
+++ b/pmd/etc/changelog.txt
@@ -21,6 +21,8 @@ New Java rules:
 CPD Command Line Changes:
   Added non-recursive option "--non-recursive" to not scan sub-directories
 
+Upgrade to javacc 5.0 (see patch #1109 Patch to build with Javacc 5.0)
+
 
 ????? ??, 2013 - 5.0.5:
 
diff --git a/pmd/pom.xml b/pmd/pom.xml
index bd480a1824..271e7756f9 100644
--- a/pmd/pom.xml
+++ b/pmd/pom.xml
@@ -240,7 +240,7 @@
         <url>http://pmd.sourceforge.net/</url>
     </organization>
     <properties>
-        <javacc.version>4.1</javacc.version>
+        <javacc.version>5.0</javacc.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- This value actually differs to maven default expectation(src/site/xdoc/)
             as we need to pre process those and we place them instead in target/generated-xdocs/.
diff --git a/pmd/src/main/ant/alljavacc.xml b/pmd/src/main/ant/alljavacc.xml
index 85f974a77d..4a19c75172 100644
--- a/pmd/src/main/ant/alljavacc.xml
+++ b/pmd/src/main/ant/alljavacc.xml
@@ -58,8 +58,8 @@
                  token="net.sourceforge.pmd.lang.ast.dummy"
                  value="net.sourceforge.pmd.lang.ast" />
         <replace file="${target}/net/sourceforge/pmd/lang/ast/dummy/JavaCharStream.java"
-                 token="public class JavaCharStream"
-                 value="public class JavaCharStream implements CharStream" />
+                 token="class JavaCharStream"
+                 value="class JavaCharStream implements CharStream" />
         <move overwrite="true"
               file="${target}/net/sourceforge/pmd/lang/ast/dummy/JavaCharStream.java"
               tofile="${target}/net/sourceforge/pmd/lang/ast/JavaCharStream.java" />
@@ -138,23 +138,23 @@
 public class]]></replacevalue>
         </replace>
         <replace file="${target}/net/sourceforge/pmd/lang/java/ast/Token.java">
-            <replacetoken><![CDATA[       default : return new Token(ofKind, image);
-     }
+            <replacetoken><![CDATA[      default : return new Token(ofKind, image);
+    }
   }
 ]]></replacetoken>
-            <replacevalue><![CDATA[       case JavaParserConstants.RUNSIGNEDSHIFT :
-       case JavaParserConstants.RSIGNEDSHIFT :
-       case JavaParserConstants.GT:
-         return new GTToken(ofKind, image);
-       default : return new Token(ofKind, image);
-     }
+            <replacevalue><![CDATA[      case JavaParserConstants.RUNSIGNEDSHIFT :
+      case JavaParserConstants.RSIGNEDSHIFT :
+      case JavaParserConstants.GT:
+        return new GTToken(ofKind, image);
+      default : return new Token(ofKind, image);
+    }
   }
 
   public static final class GTToken extends Token {
-     public int realKind = JavaParserConstants.GT;
-     public GTToken(int ofKind, String image) {
-        super(ofKind, image);
-     }
+    public int realKind = JavaParserConstants.GT;
+    public GTToken(int ofKind, String image) {
+       super(ofKind, image);
+    }
   }
 ]]></replacevalue>
         </replace>
diff --git a/pmd/src/site/xdocs/credits.xml b/pmd/src/site/xdocs/credits.xml
index 9191c4b40e..22d7dafba0 100644
--- a/pmd/src/site/xdocs/credits.xml
+++ b/pmd/src/site/xdocs/credits.xml
@@ -336,6 +336,7 @@
             <li>Simon Gijsen - contributing a PMD logo with a modern look.</li>
             <li>Yiannis Paschalidis - Fixed bug #968 Issues with JUnit4 @Test annotation with expected exception</li>
             <li>Jaroslav Snajberk - Make the comment required rule working.</li>
+            <li>Mat Booth - #1109 Patch to build with Javacc 5.0</li>
         </ul>
         </subsection>
         <subsection name="Organizations">