diff --git a/modules/comment/comment.tpl.php b/modules/comment/comment.tpl.php
index a483813..c0c6ec3 100644
--- a/modules/comment/comment.tpl.php
+++ b/modules/comment/comment.tpl.php
@@ -56,35 +56,32 @@
  * @see template_process()
  * @see theme_comment()
  */
+
+// Hide links so they can be rendered apart from $content afterwards.
+hide($content['links']);
 ?>
-<div class="<?php print $classes; ?> clearfix"<?php print $attributes; ?>>
-  <?php print $picture ?>
-
-  <?php if ($new): ?>
-    <span class="new"><?php print $new ?></span>
-  <?php endif; ?>
+<article class="<?php print $classes; ?> clearfix"<?php print $attributes; ?>>
 
   <?php print render($title_prefix); ?>
-  <h3<?php print $title_attributes; ?>><?php print $title ?></h3>
-  <?php print render($title_suffix); ?>
-
-  <div class="submitted">
+  <header>
+    <?php if ($new): ?>
+      <mark class="new"><?php print $new; ?></mark>
+    <?php endif; ?>
+    <?php print $picture; ?>
+    <h3<?php print $title_attributes; ?>><?php print $title; ?></h3>
+    <p class="submitted"><?php print $submitted; ?></p>
     <?php print $permalink; ?>
-    <?php print $submitted; ?>
-  </div>
+  </header>
+  <?php print render($title_suffix); ?>
 
   <div class="content"<?php print $content_attributes; ?>>
-    <?php
-      // We hide the comments and links now so that we can render them later.
-      hide($content['links']);
-      print render($content);
-    ?>
+    <?php print render($content); ?>
     <?php if ($signature): ?>
-    <div class="user-signature clearfix">
-      <?php print $signature ?>
-    </div>
+      <div class="user-signature">
+        <?php print $signature; ?>
+      </div>
     <?php endif; ?>
   </div>
 
-  <?php print render($content['links']) ?>
-</div>
+  <nav><?php print render($content['links']); ?></nav>
+</article>