diff --git a/modules/system/maintenance-page.tpl.php b/modules/system/maintenance-page.tpl.php
index 31de3bb..bd16756 100644
--- a/modules/system/maintenance-page.tpl.php
+++ b/modules/system/maintenance-page.tpl.php
@@ -11,10 +11,8 @@
  * @see template_preprocess_maintenance_page()
  */
 ?>
-<!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->language ?>" lang="<?php print $language->language ?>" dir="<?php print $language->dir ?>">
-
+<!DOCTYPE html>
+<html<?php print $html_attributes; ?>>
 <head>
   <title><?php print $head_title; ?></title>
   <?php print $head; ?>
@@ -23,71 +21,68 @@
 </head>
 <body class="<?php print $classes; ?>">
   <div id="page">
-    <div id="header">
+    <header id="header" role="banner">
       <div id="logo-title">
 
-        <?php if (!empty($logo)): ?>
-          <a href="<?php print $base_path; ?>" title="<?php print t('Home'); ?>" rel="home" id="logo">
+        <?php if ($logo): ?>
+          <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home" id="logo">
             <img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" />
           </a>
         <?php endif; ?>
 
+        <?php if ($site_name || $site_slogan): ?>
         <div id="name-and-slogan">
-          <?php if (!empty($site_name)): ?>
-            <h1 id="site-name">
-              <a href="<?php print $base_path ?>" title="<?php print t('Home'); ?>" rel="home"><span><?php print $site_name; ?></span></a>
-            </h1>
+          <?php if ($site_name): ?>
+            <?php if ($title): ?>
+              <p id="site-name"><strong>
+                <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"><?php print $site_name; ?></a>
+              </strong></p>
+            <?php else: /* Use h1 when the content title is empty */ ?>
+              <h1 id="site-name" role="heading">
+                <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"><?php print $site_name; ?></a>
+              </h1>
+            <?php endif; ?>
           <?php endif; ?>
 
-          <?php if (!empty($site_slogan)): ?>
-            <div id="site-slogan"><?php print $site_slogan; ?></div>
+          <?php if ($site_slogan): ?>
+            <p id="site-slogan"><?php print $site_slogan; ?></p>
           <?php endif; ?>
-        </div> <!-- /name-and-slogan -->
-      </div> <!-- /logo-title -->
-
-      <?php if (!empty($header)): ?>
-        <div id="header-region">
-          <?php print $header; ?>
-        </div>
+        </div><!-- #name-and-slogan -->
       <?php endif; ?>
 
-    </div> <!-- /header -->
+      <?php print render($page['header']); ?>
+
+    </header>
 
-    <div id="container" class="clearfix">
+    <div id="main" role="main" class="clearfix">
 
-      <?php if (!empty($sidebar_first)): ?>
+      <?php if ($page['sidebar_first']): ?>
         <div id="sidebar-first" class="column sidebar">
-          <?php print $sidebar_first; ?>
-        </div> <!-- /sidebar-first -->
+          <?php print render($page['sidebar_first']); ?>
+        </div><!-- #sidebar-first -->
       <?php endif; ?>
 
-      <div id="main" class="column"><div id="main-squeeze">
-
-        <div id="content">
-          <?php if (!empty($title)): ?><h1 class="title" id="page-title"><?php print $title; ?></h1><?php endif; ?>
-          <?php if (!empty($messages)): print $messages; endif; ?>
-          <div id="content-content" class="clearfix">
-            <?php print $content; ?>
-          </div> <!-- /content-content -->
-        </div> <!-- /content -->
-
-      </div></div> <!-- /main-squeeze /main -->
+      <div id="content">
+        <?php if (!empty($title)): ?><h1 class="title" id="page-title"><?php print $title; ?></h1><?php endif; ?>
+        <?php if (!empty($messages)): print $messages; endif; ?>
+        <section id="content-content" class="clearfix">
+          <?php print $content; ?>
+        </section> <!-- #content-content -->
+      </div> <!-- #content -->
 
-      <?php if (!empty($sidebar_second)): ?>
+      <?php if ($page['sidebar_second']): ?>
         <div id="sidebar-second" class="column sidebar">
-          <?php print $sidebar_second; ?>
-        </div> <!-- /sidebar-second -->
+          <?php print render($page['sidebar_second']); ?>
+        </div><!-- #sidebar-second -->
       <?php endif; ?>
 
-    </div> <!-- /container -->
+    </div><!-- #main -->
 
-    <div id="footer-wrapper">
-      <div id="footer">
-        <?php if (!empty($footer)): print $footer; endif; ?>
-      </div> <!-- /footer -->
-    </div> <!-- /footer-wrapper -->
+    <footer id="footer" role="contentinfo">
+      <?php print render($page['footer']); ?>
+    </footer>
 
-  </div> <!-- /page -->
+  </div> <!-- #page -->
 
 </body>
 </html>