diff --git a/pmd-jsp/etc/grammar/JspParser.jjt b/pmd-jsp/etc/grammar/JspParser.jjt
index 44481522b2..08b9218a32 100644
--- a/pmd-jsp/etc/grammar/JspParser.jjt
+++ b/pmd-jsp/etc/grammar/JspParser.jjt
@@ -137,6 +137,7 @@ PARSER_END(JspParser)
 	// anything but --%>
 | <#NO_JSP_COMMENT_END: (~["-"] | "-" ~["-"] | "--" ~["%"] | "--%" ~[">"])+ > 
 | <#NO_JSP_TAG_END: ( ~["%"] | ("%" ~[">"]) )+ >
+| <#NO_JSP_TAG_END_EXCEPT_QUOTED: ( ~["%", "\"", "'"] | ("%" ~[">"]) | <QUOTED_STRING> )+ >
 }
 
 
@@ -194,7 +195,7 @@ PARSER_END(JspParser)
 <JspScriptletState> TOKEN :
 {
 	<JSP_SCRIPTLET_END: "%>" > : AfterTagState
-|	<JSP_SCRIPTLET: <NO_JSP_TAG_END> >
+|	<JSP_SCRIPTLET: <NO_JSP_TAG_END_EXCEPT_QUOTED> >
 }
 
 <JspExpressionState> TOKEN :
@@ -206,7 +207,7 @@ PARSER_END(JspParser)
 <JspDeclarationState> TOKEN :
 {
 	<JSP_DECLARATION_END: "%>" > : AfterTagState
-|	<JSP_DECLARATION: <NO_JSP_TAG_END> >
+|	<JSP_DECLARATION: <NO_JSP_TAG_END_EXCEPT_QUOTED> >
 }
 
 <JspCommentState> TOKEN :