diff --git a/modules/node/node.tpl.php b/modules/node/node.tpl.php
index 06dc199..1c6e7b0 100644
--- a/modules/node/node.tpl.php
+++ b/modules/node/node.tpl.php
@@ -78,10 +78,8 @@
  * @see template_process()
  */
 ?>
-<div id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?> clearfix"<?php print $attributes; ?>>
-
-  <?php print $user_picture; ?>
 
+<article id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?> clearfix"<?php print $attributes; ?>>
   <?php print render($title_prefix); ?>
   <?php if (!$page): ?>
     <h2<?php print $title_attributes; ?>><a href="<?php print $node_url; ?>"><?php print $title; ?></a></h2>
@@ -89,12 +87,13 @@
   <?php print render($title_suffix); ?>
 
   <?php if ($display_submitted): ?>
-    <div class="submitted">
+    <footer class="submitted">
+      <?php print $user_picture; ?>
       <?php print $submitted; ?>
-    </div>
+    </footer>
   <?php endif; ?>
 
-  <div class="content"<?php print $content_attributes; ?>>
+  <div class="content <?php print $content_attributes; ?>">
     <?php
       // We hide the comments and links now so that we can render them later.
       hide($content['comments']);
@@ -103,8 +102,13 @@
     ?>
   </div>
 
-  <?php print render($content['links']); ?>
-
+  <?php if ($node_links = render($content['links'])): ?>
+    <nav class="node-links clearfix">
+      <?php $tag = !$page ? 'h3' : 'h2'; ?>
+      <<?php print $tag; ?> class="element-invisible"><?php print t('Article links'); ?></<?php print $tag; ?>>
+      <?php print $node_links; ?>
+    </nav>
+  <?php endif; ?>
+  
   <?php print render($content['comments']); ?>
-
-</div>
+</article>