Index: doxia/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
===================================================================
--- doxia/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java	(revision 485162)
+++ doxia/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java	(working copy)
@@ -531,15 +531,15 @@
             }
         }
 
-        String cellWidth = "width=\"" + width + "\"";
+        String cellWidth = (width != null) ? " colspan=\"" + width + "\"" : "";
 
         if ( headerRow )
         {
-            write( "<th " );
+            write( "<th" );
         }
         else
         {
-            write( "<td " );
+            write( "<td" );
         }
 
         if ( justif != null )
Index: doxia/doxia-core/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
===================================================================
--- doxia/doxia-core/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java	(revision 485162)
+++ doxia/doxia-core/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java	(working copy)
@@ -191,11 +191,11 @@
                 }
                 else if ( parser.getName().equals( "th" ) )
                 {
-                    sink.tableHeaderCell();
+                    sink.tableHeaderCell(parser.getAttributeValue( null, "colspan" ));
                 }
                 else if ( parser.getName().equals( "td" ) )
                 {
-                    sink.tableCell();
+                    sink.tableCell(parser.getAttributeValue( null, "colspan" ));
                 }
                 else
                 {