diff -urp a/zen/templates/maintenance-page.tpl.php b/zen/templates/maintenance-page.tpl.php
--- a/zen/templates/maintenance-page.tpl.php	2011-11-22 02:05:11.000000000 -0800
+++ b/zen/templates/maintenance-page.tpl.php	2011-11-23 16:27:06.000000000 -0800
@@ -37,32 +37,32 @@

   <div id="page-wrapper"><div id="page">

-    <div id="header"><div class="section clearfix">
+    <header id="header"><div class="section clearfix">

       <?php if ($logo): ?>
         <a href="<?php print $base_path; ?>" 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">
+        <hgroup id="name-and-slogan">
           <?php if ($site_name): ?>
-            <div id="site-name"><strong>
+            <h1 id="site-name">
               <a href="<?php print $base_path; ?>" title="<?php print t('Home'); ?>" rel="home">
               <span><?php print $site_name; ?></span>
               </a>
-            </strong></div>
+            </h1>
           <?php endif; ?>
           <?php if ($site_slogan): ?>
-            <div id="site-slogan"><?php print $site_slogan; ?></div>
+            <h2 id="site-slogan"><?php print $site_slogan; ?></h2>
           <?php endif; ?>
-        </div><!-- /#name-and-slogan -->
+        </hgroup><!-- /#name-and-slogan -->
       <?php endif; ?>

       <?php print $header; ?>

-    </div></div><!-- /.section, /#header -->
+    </div></header><!-- /.section, /#header -->

-    <div id="main-wrapper"><div id="main" class="clearfix<?php if ($navigation) { print ' with-navigation'; } ?>">
+    <div id="main-wrapper"><section id="main" class="clearfix<?php if ($navigation) { print ' with-navigation'; } ?>">

       <div id="content" class="column"><div class="section">

@@ -89,7 +89,7 @@

       <?php print $sidebar_second; ?>

-    </div></div><!-- /#main, /#main-wrapper -->
+    </section></div><!-- /#main, /#main-wrapper -->

     <?php print $footer; ?>

diff -urp a/zen/templates/page.tpl.php b/zen/templates/page.tpl.php
--- a/zen/templates/page.tpl.php	2011-11-22 02:05:11.000000000 -0800
+++ b/zen/templates/page.tpl.php	2011-11-23 17:07:05.000000000 -0800
@@ -72,30 +72,24 @@

 <div id="page-wrapper"><div id="page">

-  <div id="header"><div class="section clearfix">
+  <header id="header"><div class="section clearfix">

     <?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">
+      <hgroup id="name-and-slogan">
         <?php if ($site_name): ?>
-          <?php if ($title): ?>
-            <div id="site-name"><strong>
-              <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"><span><?php print $site_name; ?></span></a>
-            </strong></div>
-          <?php else: /* Use h1 when the content title is empty */ ?>
-            <h1 id="site-name">
-              <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"><span><?php print $site_name; ?></span></a>
-            </h1>
-          <?php endif; ?>
+          <h1 id="site-name">
+            <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"><span><?php print $site_name; ?></span></a>
+          </h1>
         <?php endif; ?>

         <?php if ($site_slogan): ?>
-          <div id="site-slogan"><?php print $site_slogan; ?></div>
+          <h2 id="site-slogan"><?php print $site_slogan; ?></h2>
         <?php endif; ?>
-      </div><!-- /#name-and-slogan -->
+      </hgroup><!-- /#name-and-slogan -->
     <?php endif; ?>

     <?php print theme('links__system_secondary_menu', array(
@@ -113,9 +107,9 @@

     <?php print render($page['header']); ?>

-  </div></div><!-- /.section, /#header -->
+  </div></header><!-- /.section, /#header -->

-  <div id="main-wrapper"><div id="main" class="clearfix<?php if ($main_menu || $page['navigation']) { print ' with-navigation'; } ?>">
+  <div id="main-wrapper"><section id="main" class="clearfix<?php if ($main_menu || $page['navigation']) { print ' with-navigation'; } ?>">

     <div id="content" class="column"><div class="section">
       <?php print render($page['highlighted']); ?>
@@ -137,7 +131,7 @@
     </div></div><!-- /.section, /#content -->

     <?php if ($page['navigation'] || $main_menu): ?>
-      <div id="navigation"><div class="section clearfix">
+      <nav id="navigation"><div class="section clearfix">

         <?php print theme('links__system_main_menu', array(
           'links' => $main_menu,
@@ -154,14 +148,14 @@

         <?php print render($page['navigation']); ?>

-      </div></div><!-- /.section, /#navigation -->
+      </div></nav><!-- /.section, /#navigation -->
     <?php endif; ?>

     <?php print render($page['sidebar_first']); ?>

     <?php print render($page['sidebar_second']); ?>

-  </div></div><!-- /#main, /#main-wrapper -->
+  </section></div><!-- /#main, /#main-wrapper -->

   <?php print render($page['footer']); ?>