diff --git a/core/modules/system/page.tpl.php b/core/modules/system/page.tpl.php
index 23b577e..7615ac3 100644
--- a/core/modules/system/page.tpl.php
+++ b/core/modules/system/page.tpl.php
@@ -76,24 +76,20 @@
         </a>
       <?php endif; ?>
 
-      <?php if ($site_name || $site_slogan): ?>
-        <div id="name-and-slogan">
+      <?php if ($site_name && $site_slogan): ?>
+        <hgroup id="name-and-slogan">
+      <?php endif; ?>
           <?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">
                 <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 ($site_slogan): ?>
-            <p id="site-slogan"><?php print $site_slogan; ?></p>
+            <h2 id="site-slogan"><?php print $site_slogan; ?></h2>
           <?php endif; ?>
-        </div><!-- #name-and-slogan -->
+      <?php if ($site_name && $site_slogan): ?>
+        </hgroup><!-- #name-and-slogan -->
       <?php endif; ?>
 
       <?php print render($page['header']); ?>