diff --git a/pmd/rulesets/internal/dogfood-goal.xml b/pmd/rulesets/internal/dogfood-goal.xml
index b5481845d6..947ed02890 100644
--- a/pmd/rulesets/internal/dogfood-goal.xml
+++ b/pmd/rulesets/internal/dogfood-goal.xml
@@ -6,11 +6,18 @@
 	xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
 	<description>Dogfood goal, delete this when we reach it.</description>
 
-	<exclude-pattern>.*net/sourceforge/pmd/lang/ast/JavaCharStream.java</exclude-pattern>
-	<exclude-pattern>.*net/sourceforge/pmd/lang/ast/SimpleCharStream.java</exclude-pattern>
-	<exclude-pattern>.*net/sourceforge/pmd/lang/ast/TokenMgrError.java</exclude-pattern>
-	<exclude-pattern>.*lang/.*/ast/.*.java</exclude-pattern>
-	<exclude-pattern>.*cppast/.*.java</exclude-pattern>
+	<!-- Exclude JavaCC generated artifacts -->
+	<exclude-pattern>.*net/sourceforge/pmd/lang/ast/JavaCharStream.java</exclude-pattern>
+	<exclude-pattern>.*net/sourceforge/pmd/lang/ast/SimpleCharStream.java</exclude-pattern>
+	<exclude-pattern>.*net/sourceforge/pmd/lang/ast/TokenMgrError.java</exclude-pattern>
+	<exclude-pattern>.*lang/(java|jsp|cpp)/ast/.*Parser.java</exclude-pattern>
+	<exclude-pattern>.*lang/(java|jsp|cpp)/ast/.*ParserConstants.java</exclude-pattern>
+	<exclude-pattern>.*lang/(java|jsp|cpp)/ast/.*ParserTokenManager.java</exclude-pattern>
+	<exclude-pattern>.*lang/(java|jsp|cpp)/ast/.*ParserTreeConstants.java</exclude-pattern>
+	<exclude-pattern>.*lang/(java|jsp|cpp)/ast/.*ParserVisitor.java</exclude-pattern>
+	<exclude-pattern>.*lang/(java|jsp|cpp)/ast/JJT.*ParserState.java</exclude-pattern>
+	<exclude-pattern>.*lang/(java|jsp|cpp)/ast/ParseException.java</exclude-pattern>
+	<exclude-pattern>.*lang/(java|jsp|cpp)/ast/Token.java</exclude-pattern>
 
 	<rule ref="rulesets/internal/pmdspecific.xml"/>