diff --git a/pmd/etc/grammar/Java.jjt b/pmd/etc/grammar/Java.jjt
index cd1e2c5526..523cf2eb2d 100644
--- a/pmd/etc/grammar/Java.jjt
+++ b/pmd/etc/grammar/Java.jjt
@@ -1318,7 +1318,7 @@ void FormalParameter() :
 {
 }
 {
-   ( "final" {jjtThis.setFinal();} | Annotation() )*
+   ( "final" {jjtThis.setFinal(true);} | Annotation() )*
    Type()
    [ "..." {checkForBadVariableArgumentsUsage();} {jjtThis.setVarargs();} ]
    VariableDeclaratorId()
@@ -1789,7 +1789,7 @@ void BlockStatement():
 void LocalVariableDeclaration() :
 {}
 {
-  ( "final" {jjtThis.setFinal();} | Annotation() )*
+  ( "final" {jjtThis.setFinal(true);} | Annotation() )*
   Type()
   VariableDeclarator()
   ( "," VariableDeclarator() )*
diff --git a/pmd/src/net/sourceforge/pmd/lang/java/ast/JavaParser.java b/pmd/src/net/sourceforge/pmd/lang/java/ast/JavaParser.java
index 0d2a5a3728..5487d0642a 100644
--- a/pmd/src/net/sourceforge/pmd/lang/java/ast/JavaParser.java
+++ b/pmd/src/net/sourceforge/pmd/lang/java/ast/JavaParser.java
@@ -1557,7 +1557,7 @@ jjtn000.setModifiers(modifiers);
         switch (jj_nt.kind) {
         case FINAL:
           jj_consume_token(FINAL);
-              jjtn000.setFinal();
+              jjtn000.setFinal(true);
           break;
         case AT:
           Annotation();
@@ -4215,7 +4215,7 @@ jjtree.openNodeScope(jjtn000);Token t;
         switch (jj_nt.kind) {
         case FINAL:
           jj_consume_token(FINAL);
-             jjtn000.setFinal();
+             jjtn000.setFinal(true);
           break;
         case AT:
           Annotation();
@@ -8080,6 +8080,11 @@ jjtn000.setModifiers(modifiers);
     return false;
   }
 
+  private boolean jj_3R_213() {
+    if (jj_3R_98()) return true;
+    return false;
+  }
+
   private boolean jj_3R_362() {
     if (jj_3R_373()) return true;
     Token xsp;
@@ -8090,11 +8095,6 @@ jjtn000.setModifiers(modifiers);
     return false;
   }
 
-  private boolean jj_3R_213() {
-    if (jj_3R_98()) return true;
-    return false;
-  }
-
   private boolean jj_3_43() {
     if (jj_3R_75()) return true;
     Token xsp;