diff --git a/Zend/zend-scanner.l b/Zend/zend-scanner.l
index a9e6d2944ad..116dcf72a85 100644
--- a/Zend/zend-scanner.l
+++ b/Zend/zend-scanner.l
@@ -993,8 +993,9 @@ ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+
 }
 
 
-<INITIAL>"<%=" {
-	if (CG(asp_tags)) {
+<INITIAL>"<%="|"<?=" {
+	if ((yytext[1]=='%' && CG(asp_tags))
+		|| (yytext[1]=='?' && CG(short_tags))) {
 		zendlval->value.str.val = yytext; /* no copying - intentional */
 		zendlval->value.str.len = yyleng;
 		zendlval->type = IS_STRING;