diff --git a/pmd-visualforce/etc/grammar/VfParser.jjt b/pmd-visualforce/etc/grammar/VfParser.jjt
index cf17d312d4..6ad0928643 100644
--- a/pmd-visualforce/etc/grammar/VfParser.jjt
+++ b/pmd-visualforce/etc/grammar/VfParser.jjt
@@ -15,7 +15,7 @@ PARSER_BEGIN(VfParser)
 package net.sourceforge.pmd.lang.vf.ast;
 
 import net.sourceforge.pmd.lang.ast.CharStream;
-import net.sourceforge.pmd.lang.vf.ast.TokenMgrError;
+import net.sourceforge.pmd.lang.ast.TokenMgrError;
 
 public class VfParser {
 
@@ -250,9 +250,9 @@ PARSER_END(VfParser)
 
 <AttrValueBetweenDoubleQuotesState> TOKEN :
 {
-		<ENDING_DOUBLE_QUOTE: "\""> : InTagState
+	  <ENDING_DOUBLE_QUOTE: "\""> : InTagState
 	| <EL_EXPRESSION_IN_ATTRIBUTE_DQ: "{!" (<WHITESPACES>)? > : ElAttribTagStateDQ
-	|	<UNPARSED_TEXT_NO_DOUBLE_QUOTES:
+	| <UNPARSED_TEXT_NO_DOUBLE_QUOTES:
 		( (~["{", "\""]) | (["{"] ~["!", "\""]) )+ >
 }
 
diff --git a/pmd-visualforce/src/main/ant/alljavacc.xml b/pmd-visualforce/src/main/ant/alljavacc.xml
index db23e5fb21..9637b35151 100644
--- a/pmd-visualforce/src/main/ant/alljavacc.xml
+++ b/pmd-visualforce/src/main/ant/alljavacc.xml
@@ -33,8 +33,7 @@
                 javacchome="${javacc-home.path}" />
         <!-- Ensure generated using CharStream interface debugparser="true"
         		debugtokenmanager="true"-->
-        <javacc static="false"
-        		
+        <javacc static="false"        	
                 usercharstream="true"
                 unicodeinput="true"
                 javaunicodeescape="false"
@@ -44,6 +43,7 @@
         <delete file="${target}/net/sourceforge/pmd/lang/vf/ast/Node.java" />
         <delete file="${target}/net/sourceforge/pmd/lang/vf/ast/SimpleNode.java" />
         <delete file="${target}/net/sourceforge/pmd/lang/vf/ast/CharStream.java" />
+        <delete file="${target}/net/sourceforge/pmd/lang/vf/ast/TokenMgrError.java" />
         <replace file="${target}/net/sourceforge/pmd/lang/vf/ast/VfParserTokenManager.java"
                  token="class VfParserTokenManager"
                  value="class VfParserTokenManager extends net.sourceforge.pmd.lang.ast.AbstractTokenManager" />