diff --git a/core/themes/seven/templates/maintenance-page.tpl.php b/core/themes/seven/templates/maintenance-page.tpl.php
index 835aa6c960b..fff11d848a5 100644
--- a/core/themes/seven/templates/maintenance-page.tpl.php
+++ b/core/themes/seven/templates/maintenance-page.tpl.php
@@ -13,9 +13,8 @@
  * @ingroup themeable
  */
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php print $language->langcode ?>" lang="<?php print $language->langcode ?>" dir="<?php print $language->dir ?>">
+<!DOCTYPE html>
+<html lang="<?php print $language->langcode ?>" dir="<?php print $language->dir ?>">
   <head>
     <title><?php print $head_title; ?></title>
     <?php print $head; ?>
@@ -26,9 +25,9 @@
 
   <?php print $page_top; ?>
 
-  <div id="branding">
+  <header id="branding">
     <?php if ($title): ?><h1 class="page-title"><?php print $title; ?></h1><?php endif; ?>
-  </div>
+  </header>
 
   <div id="page">
 
@@ -41,7 +40,7 @@
       <?php endif; ?>
     </div>
 
-    <div id="content" class="clearfix">
+    <main id="content" class="clearfix">
       <?php if ($messages): ?>
         <div id="console"><?php print $messages; ?></div>
       <?php endif; ?>
@@ -51,11 +50,13 @@
         </div>
       <?php endif; ?>
       <?php print $content; ?>
-    </div>
+    </main>
 
   </div>
 
-  <?php print $page_bottom; ?>
+  <footer role="contentinfo">
+    <?php print $page_bottom; ?>
+  </footer>
 
   </body>
 </html>
diff --git a/core/themes/seven/templates/page.tpl.php b/core/themes/seven/templates/page.tpl.php
index 4571dfb916b..d1a290c3996 100644
--- a/core/themes/seven/templates/page.tpl.php
+++ b/core/themes/seven/templates/page.tpl.php
@@ -16,7 +16,7 @@
  * @ingroup themeable
  */
 ?>
-  <div id="branding" class="clearfix" role="navigation">
+  <header id="branding" class="clearfix" role="navigation">
     <?php print $breadcrumb; ?>
     <?php print render($title_prefix); ?>
     <?php if ($title): ?>
@@ -26,14 +26,14 @@
     <?php if ($primary_local_tasks): ?>
       <?php print '<div role="tab">' . render($primary_local_tasks) . '</div>'; ?>
     <?php endif; ?>
-  </div>
+  </header>
 
   <div id="page">
     <?php if ($secondary_local_tasks): ?>
       <div class="tabs-secondary clearfix" role="navigation"><?php print render($secondary_local_tasks); ?></div>
     <?php endif; ?>
 
-    <div id="content" class="clearfix" role="main">
+    <main id="content" class="clearfix" role="main">
       <div class="element-invisible"><a id="main-content"></a></div>
       <?php if ($messages): ?>
         <div id="console" class="clearfix"><?php print $messages; ?></div>
@@ -45,10 +45,10 @@
       <?php endif; ?>
       <?php if ($action_links): ?><ul class="action-links"><?php print render($action_links); ?></ul><?php endif; ?>
       <?php print render($page['content']); ?>
-    </div>
+    </main>
 
-    <div id="footer" role="contentinfo">
+    <footer id="footer" role="contentinfo">
       <?php print $feed_icons; ?>
-    </div>
+    </footer>
 
   </div>
