diff --git a/pmd-visualforce/etc/grammar/VfParser.jjt b/pmd-visualforce/etc/grammar/VfParser.jjt
index 67bd67c061..f373794e53 100644
--- a/pmd-visualforce/etc/grammar/VfParser.jjt
+++ b/pmd-visualforce/etc/grammar/VfParser.jjt
@@ -49,6 +49,7 @@ public class VfParser {
 PARSER_END(VfParser)
 
 /** *************************  VF LEXICON  **************************** */
+// functionCall: identifier LPAREN expression? (COMMA expression)* RPAREN;
 
 <*> TOKEN :
 {
@@ -147,7 +148,7 @@ PARSER_END(VfParser)
   <ATTR_NAME: <IDENTIFIER> >
 | <TAG_END: ">"            >            : AfterTagState
 | <DECL_END: ("?>" | "!>") >            : AfterTagState
-| <TAG_SLASHEND: "/>" >                 : AfterTagState
+| <TAG_SLASHEND: ("/>" | "/ >") >       : AfterTagState
 | <ATTR_EQ: "=" >                       : AttrValueState
 | <IN_TAG_ERROR: ~[] >
 }
@@ -212,6 +213,7 @@ PARSER_END(VfParser)
 ASTCompilationUnit CompilationUnit() :
 {}
 {
+	(Bom())?
   Prolog()
 
   Content() <EOF>
@@ -237,6 +239,12 @@ void Prolog() #void :
 	)?
 }
 
+void Bom() #void :
+{}
+{
+	<BYTE_ORDER_MARK: "\ufeff" >
+}
+
 /**
  * Everything between a start-tag and the corresponding end-tag of an element (if an end tag exists).
  */