diff --git a/ChangeLog b/ChangeLog
index d5b00746..20f484a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Apr 24 13:21:36 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+	* HTMLparser.c: Jonas Borgström patch, the <td>, and <th> elements
+	  now means the end of any open <span>,<font>,<a>,<b>,<i>,<u>.
+
 Mon Apr 23 15:40:04 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
 
 	* DOCBparser.c DOCBparser.h testDocbook.c configure.in Makefile.am
diff --git a/HTMLparser.c b/HTMLparser.c
index 55099192..1e147789 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -508,8 +508,8 @@ const char *htmlStartClose[] = {
 "col",		"caption", "col", "p", NULL,
 "table",	"p", "head", "h1", "h2", "h3", "h4", "h5", "h6", "pre",
 		"listing", "xmp", "a", NULL,
-"th",		"th", "td", NULL,
-"td",		"th", "td", "p", NULL,
+"th",		"th", "td", "p", "span", "font", "a", "b", "i", "u", NULL,
+"td",		"th", "td", "p", "span", "font", "a", "b", "i", "u", NULL,      
 "tr",		"th", "td", "tr", "caption", "col", "colgroup", "p", NULL,
 "thead",	"caption", "col", "colgroup", NULL,
 "tfoot",	"th", "td", "tr", "caption", "col", "colgroup", "thead",