diff --git a/changelog/src/plugin-resources/changelog.jsl b/changelog/src/plugin-resources/changelog.jsl
index 062c727a..a9ead81e 100644
--- a/changelog/src/plugin-resources/changelog.jsl
+++ b/changelog/src/plugin-resources/changelog.jsl
@@ -24,11 +24,14 @@
             <x:expr select="count(./changelog-entry/file)"/>
           </p>
           <table>
-            <tr>
-              <th>Date</th>
-              <th>Author</th>
-              <th>File/Message</th>
-            </tr>
+            <thead>
+              <tr>
+                <th>Date</th>
+                <th>Author</th>
+                <th>File/Message</th>
+              </tr>
+            </thead>
+            <tbody>
             <x:set var="changes" select="changelog-entry"/>
             <j:forEach var="change" items="${changes}">
               <tr>
@@ -42,6 +45,7 @@
                 <td>
                 
                   <x:forEach var="file" select="$change/file">
+                    <p>
             
                     <j:set var="name"><x:expr select="$file/name"/></j:set>
                     <j:set var="revision"><x:expr select="$file/revision"/></j:set>
@@ -71,10 +75,9 @@
                       </j:otherwise>
                     </j:choose>
 
-                    <br/>
+                    </p>
                   
                   </x:forEach>
-                  <p/>
                   
                   <!-- This works -->
                   <x:expr select="$change/msg"/>
@@ -92,6 +95,7 @@
                 </td>
               </tr>
             </j:forEach>
+            </tbody>
           </table>
         </section>
       </body>
diff --git a/changelog/xdocs/changes.xml b/changelog/xdocs/changes.xml
index 43e446ca..04d81bfc 100644
--- a/changelog/xdocs/changes.xml
+++ b/changelog/xdocs/changes.xml
@@ -9,6 +9,7 @@
   <body>
 
   	<release version="1.4" date="in CVS">
+      <action dev="dion" type="fix" issue="MPCHANGELOG-28">Fix bad HTML</action>
   	  <action dev="evenisse" type="update">
   	    Add maven.changelog.basedir property.
   	  </action>