--- a/modules/quercus/src/com/caucho/quercus/parser/QuercusParser.java
+++ b/modules/quercus/src/com/caucho/quercus/parser/QuercusParser.java
@@ -4014,6 +4014,12 @@ public class QuercusParser {
       }
       else if ((ch = readByte()) == '/')
         return;
+      else if (ch == '\n' || ch == '\r') {
+        // This is the "ch" assigned in the "if" above, not the one
+        // from the "while"; don't want to unread it or we will increment
+        // the current line number twice in the case of "*" at the end
+        // of a line.
+      }
       else
 	    _is.unread();
     }