diff --git a/modules/book/book-export-html.tpl.php b/modules/book/book-export-html.tpl.php
index 4b25a76..e903bb5 100644
--- a/modules/book/book-export-html.tpl.php
+++ b/modules/book/book-export-html.tpl.php
@@ -16,8 +16,8 @@
  * @see template_preprocess_book_export_html()
  */
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="<?php print $language->language; ?>" xml:lang="<?php print $language->language; ?>">
+<!DOCTYPE html >
+<html<?php print $html_attributes; ?>>
   <head>
     <title><?php print $title; ?></title>
     <?php print $head; ?>
diff --git a/modules/book/book-node-export-html.tpl.php b/modules/book/book-node-export-html.tpl.php
index ef6c322..0d3fc25 100644
--- a/modules/book/book-node-export-html.tpl.php
+++ b/modules/book/book-node-export-html.tpl.php
@@ -17,8 +17,8 @@
  * @see template_preprocess_book_node_export_html()
  */
 ?>
-<div id="node-<?php print $node->nid; ?>" class="section-<?php print $depth; ?>">
+<section id="node-<?php print $node->nid; ?>" class="section-<?php print $depth; ?>">
   <h1 class="book-heading"><?php print $title; ?></h1>
   <?php print $content; ?>
   <?php print $children; ?>
-</div>
+</section>
diff --git a/modules/system/maintenance-page.tpl.php b/modules/system/maintenance-page.tpl.php
index 31de3bb..495d28e 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,7 +21,7 @@
 </head>
 <body class="<?php print $classes; ?>">
   <div id="page">
-    <div id="header">
+    <header>
       <div id="logo-title">
 
         <?php if (!empty($logo)): ?>
@@ -42,8 +40,8 @@
           <?php if (!empty($site_slogan)): ?>
             <div id="site-slogan"><?php print $site_slogan; ?></div>
           <?php endif; ?>
-        </div> <!-- /name-and-slogan -->
-      </div> <!-- /logo-title -->
+        </div> <!-- #name-and-slogan -->
+      </div> <!-- #logo-title -->
 
       <?php if (!empty($header)): ?>
         <div id="header-region">
@@ -51,43 +49,39 @@
         </div>
       <?php endif; ?>
 
-    </div> <!-- /header -->
+    </header>
 
     <div id="container" class="clearfix">
 
       <?php if (!empty($sidebar_first)): ?>
         <div id="sidebar-first" class="column sidebar">
           <?php print $sidebar_first; ?>
-        </div> <!-- /sidebar-first -->
+        </div> <!-- #sidebar-first -->
       <?php endif; ?>
 
-      <div id="main" class="column"><div id="main-squeeze">
+      <div id="main" class="column">
 
         <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">
+          <section id="content-content" class="clearfix">
             <?php print $content; ?>
-          </div> <!-- /content-content -->
-        </div> <!-- /content -->
+          </section> <!-- #content-content -->
+        </div> <!-- #content -->
 
-      </div></div> <!-- /main-squeeze /main -->
+      </div> <!-- #main -->
 
       <?php if (!empty($sidebar_second)): ?>
         <div id="sidebar-second" class="column sidebar">
           <?php print $sidebar_second; ?>
-        </div> <!-- /sidebar-second -->
+        </div> <!-- #sidebar-second -->
       <?php endif; ?>
 
-    </div> <!-- /container -->
+    </div> <!-- #container -->
 
-    <div id="footer-wrapper">
-      <div id="footer">
-        <?php if (!empty($footer)): print $footer; endif; ?>
-      </div> <!-- /footer -->
-    </div> <!-- /footer-wrapper -->
+    <?php if (!empty($footer)): ?><footer><?php print $footer; ?></footer><?php endif; ?>
 
-  </div> <!-- /page -->
+  </div> <!-- #page -->
 
 </body>
 </html>
