diff --git a/HTMLparser.c b/HTMLparser.c
index 574f4abe..7c45e404 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -272,7 +272,7 @@ htmlNodeInfoPop(htmlParserCtxtPtr ctxt)
 
 
 #define NEXTL(l) do {							\
-    if (*(ctxt->input->cur) == '\n') {					\
+    if ((CUR == '\n') || ((CUR == '\r') && (NXT(1) == '\n'))) {		\
 	ctxt->input->line++; ctxt->input->col = 1;			\
     } else ctxt->input->col++;						\
     ctxt->input->cur += l;						\
diff --git a/result/HTML/doc3.htm.err b/result/HTML/doc3.htm.err
index 58404bc8..14adece8 100644
--- a/result/HTML/doc3.htm.err
+++ b/result/HTML/doc3.htm.err
@@ -1,48 +1,48 @@
-./test/HTML/doc3.htm:81: HTML parser error : Unexpected end tag : p
+./test/HTML/doc3.htm:148: HTML parser error : Unexpected end tag : p
   </P></TD></TR></TBODY></TABLE></CENTER></TD></TR></TBODY></TABLE></CENTER></P>
                                                                                ^
-./test/HTML/doc3.htm:151: HTML parser error : Unexpected end tag : font
+./test/HTML/doc3.htm:236: HTML parser error : Unexpected end tag : font
             Specials<BR><BR></FONT></A><BR></FONT></A><B><FONT color=yellow 
                                                   ^
-./test/HTML/doc3.htm:151: HTML parser error : Unexpected end tag : a
+./test/HTML/doc3.htm:236: HTML parser error : Unexpected end tag : a
             Specials<BR><BR></FONT></A><BR></FONT></A><B><FONT color=yellow 
                                                       ^
-./test/HTML/doc3.htm:391: HTML parser error : Unexpected end tag : li
+./test/HTML/doc3.htm:747: HTML parser error : Unexpected end tag : li
 light.com/ad_static.asp?pid=2097&sid=1881&asid=7708"></a></IFRAME></CENTER></LI>
                                                                                ^
-./test/HTML/doc3.htm:391: HTML parser error : Unexpected end tag : font
+./test/HTML/doc3.htm:747: HTML parser error : Unexpected end tag : font
 om/ad_static.asp?pid=2097&sid=1881&asid=7708"></a></IFRAME></CENTER></LI></FONT>
                                                                                ^
-./test/HTML/doc3.htm:391: HTML parser error : Unexpected end tag : p
+./test/HTML/doc3.htm:747: HTML parser error : Unexpected end tag : p
 =7708"></a></IFRAME></CENTER></LI></FONT></TD></TR></TBODY></TABLE></CENTER></P>
                                                                                ^
-./test/HTML/doc3.htm:399: HTML parser error : Unexpected end tag : form
+./test/HTML/doc3.htm:772: HTML parser error : Unexpected end tag : form
             archive</A></FONT> </FORM></CENTER></TD></TR></TBODY></TABLE><!--			
                                       ^
-./test/HTML/doc3.htm:403: HTML parser error : Unexpected end tag : a
+./test/HTML/doc3.htm:820: HTML parser error : Unexpected end tag : a
             </A></A></B><B></NOSCRIPT></B><B><!-- END GoTo.com Search Box --></B
                     ^
-./test/HTML/doc3.htm:403: HTML parser error : Unexpected end tag : noscript
+./test/HTML/doc3.htm:820: HTML parser error : Unexpected end tag : noscript
             </A></A></B><B></NOSCRIPT></B><B><!-- END GoTo.com Search Box --></B
                                       ^
-./test/HTML/doc3.htm:404: HTML parser error : Opening and ending tag mismatch: form and center
+./test/HTML/doc3.htm:826: HTML parser error : Opening and ending tag mismatch: form and center
             </FORM><!-- Pricewatch Search Box --><A 
                    ^
-./test/HTML/doc3.htm:410: HTML parser error : Unexpected end tag : p
+./test/HTML/doc3.htm:833: HTML parser error : Unexpected end tag : p
             Special<BR>Code:BP6-hd</FONT></A> </P></CENTER></TD></TR></TBODY></T
                                                   ^
-./test/HTML/doc3.htm:410: HTML parser error : Opening and ending tag mismatch: center and td
+./test/HTML/doc3.htm:833: HTML parser error : Opening and ending tag mismatch: center and td
             Special<BR>Code:BP6-hd</FONT></A> </P></CENTER></TD></TR></TBODY></T
                                                            ^
-./test/HTML/doc3.htm:412: HTML parser error : Unexpected end tag : p
+./test/HTML/doc3.htm:839: HTML parser error : Unexpected end tag : p
 width="100%">&nbsp;</TD></TR></TBODY></TABLE></P></CENTER></TR></TBODY></TABLE><
                                                  ^
-./test/HTML/doc3.htm:412: HTML parser error : Unexpected end tag : td
+./test/HTML/doc3.htm:840: HTML parser error : Unexpected end tag : td
 <CENTER></CENTER></TD></TR><TR><TD COLSPAN="3" VALIGN="TOP" 
                       ^
-./test/HTML/doc3.htm:412: HTML parser error : Unexpected end tag : tr
+./test/HTML/doc3.htm:840: HTML parser error : Unexpected end tag : tr
 <CENTER></CENTER></TD></TR><TR><TD COLSPAN="3" VALIGN="TOP" 
                            ^
-./test/HTML/doc3.htm:413: HTML parser error : Unexpected end tag : table
+./test/HTML/doc3.htm:841: HTML parser error : Unexpected end tag : table
 HEIGHT="70">&nbsp;</TD> </TR></TABLE>
                                      ^
diff --git a/result/HTML/test3.html.err b/result/HTML/test3.html.err
index c4420a5c..c7435030 100644
--- a/result/HTML/test3.html.err
+++ b/result/HTML/test3.html.err
@@ -1,12 +1,12 @@
-./test/HTML/test3.html:1: HTML parser error : Unexpected end tag : p
+./test/HTML/test3.html:6: HTML parser error : Unexpected end tag : p
 </a><p><hr></p>
                ^
-./test/HTML/test3.html:1: HTML parser error : Unexpected end tag : p
+./test/HTML/test3.html:13: HTML parser error : Unexpected end tag : p
 <p><hr></p>
            ^
-./test/HTML/test3.html:1: HTML parser error : Opening and ending tag mismatch: h4 and b
+./test/HTML/test3.html:27: HTML parser error : Opening and ending tag mismatch: h4 and b
 <h4><b>Links</h4></b>
                  ^
-./test/HTML/test3.html:1: HTML parser error : Unexpected end tag : b
+./test/HTML/test3.html:27: HTML parser error : Unexpected end tag : b
 <h4><b>Links</h4></b>
                      ^
diff --git a/result/HTML/wired.html.err b/result/HTML/wired.html.err
index 5cce2b0e..156b6637 100644
--- a/result/HTML/wired.html.err
+++ b/result/HTML/wired.html.err
@@ -1,54 +1,54 @@
-./test/HTML/wired.html:125: HTML parser error : Unexpected end tag : form
+./test/HTML/wired.html:170: HTML parser error : Unexpected end tag : form
 	</tr>    </form>
 	                ^
-./test/HTML/wired.html:220: HTML parser error : Unexpected end tag : form
+./test/HTML/wired.html:265: HTML parser error : Unexpected end tag : form
         </tr>  </form>
                       ^
-./test/HTML/wired.html:301: HTML parser error : Opening and ending tag mismatch: td and font
+./test/HTML/wired.html:346: HTML parser error : Opening and ending tag mismatch: td and font
 </td>
      ^
-./test/HTML/wired.html:329: HTML parser error : Opening and ending tag mismatch: td and font
+./test/HTML/wired.html:374: HTML parser error : Opening and ending tag mismatch: td and font
 Readers on Apple's G4 ... AOL's passwords ... MS vs. Linux.</font><br><br>  </td
                                                                                ^
-./test/HTML/wired.html:329: HTML parser error : Opening and ending tag mismatch: td and font
+./test/HTML/wired.html:374: HTML parser error : Opening and ending tag mismatch: td and font
 Readers on Apple's G4 ... AOL's passwords ... MS vs. Linux.</font><br><br>  </td
                                                                                ^
-./test/HTML/wired.html:357: HTML parser error : Opening and ending tag mismatch: a and font
+./test/HTML/wired.html:402: HTML parser error : Opening and ending tag mismatch: a and font
 w.vignette.com/" style="text-decoration:none"><font color="#000000">Vignette</a>
                                                                                ^
-./test/HTML/wired.html:363: HTML parser error : Opening and ending tag mismatch: a and font
+./test/HTML/wired.html:408: HTML parser error : Opening and ending tag mismatch: a and font
 com&BANNER=Sprint" style="text-decoration:none"><font color="#000000">Sprint</a>
                                                                                ^
-./test/HTML/wired.html:363: HTML parser error : Unexpected end tag : font<
+./test/HTML/wired.html:408: HTML parser error : Unexpected end tag : font<
 " style="text-decoration:none"><font color="#000000">Sprint</a></i></font</font>
                                                                                ^
-./test/HTML/wired.html:369: HTML parser error : Opening and ending tag mismatch: td and font
+./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: td and font
 </td>
      ^
-./test/HTML/wired.html:369: HTML parser error : Opening and ending tag mismatch: td and font
+./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: td and font
 </td>
      ^
-./test/HTML/wired.html:369: HTML parser error : Opening and ending tag mismatch: td and font
+./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: td and font
 </td>
      ^
-./test/HTML/wired.html:369: HTML parser error : Opening and ending tag mismatch: td and font
+./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: td and font
 </td>
      ^
-./test/HTML/wired.html:369: HTML parser error : Opening and ending tag mismatch: td and font
+./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: td and font
 </td>
      ^
-./test/HTML/wired.html:369: HTML parser error : Opening and ending tag mismatch: td and font
+./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: td and font
 </td>
      ^
-./test/HTML/wired.html:369: HTML parser error : Opening and ending tag mismatch: td and font
+./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: td and font
 </td>
      ^
-./test/HTML/wired.html:369: HTML parser error : Opening and ending tag mismatch: td and font
+./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: td and font
 </td>
      ^
-./test/HTML/wired.html:369: HTML parser error : Opening and ending tag mismatch: td and font
+./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: td and font
 </td>
      ^
-./test/HTML/wired.html:369: HTML parser error : Opening and ending tag mismatch: td and font
+./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: td and font
 </td>
      ^