diff --git a/_layouts/default.html b/_layouts/default.html
index 1faac9b5..336eb857 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -26,7 +26,7 @@
     <div class="container bs-docs-container">
       <div class="row">
         <div class="col-lg-3">
-          <div class="bs-sidebar" role="complementary">
+          <aside class="bs-sidebar" role="complementary">
             <ul class="nav bs-sidenav">
               {% if page.slug == "getting-started" %}
                 {% include nav-getting-started.html %}
@@ -40,7 +40,7 @@
                 {% include nav-customize.html %}
               {% endif %}
             </ul>
-          </div>
+          </aside>
         </div>
         <main class="col-lg-9" role="main">
           {{ content }}
diff --git a/_layouts/home.html b/_layouts/home.html
index 6beee6c5..2d04e5f7 100644
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -17,7 +17,7 @@
     <!-- Callout for the old docs link -->
     {% include old-bs-docs.html %}
 
-    <div class="container" role="contentinfo">
+    <footer class="container" role="contentinfo">
       {% include social-buttons.html %}
 
       <ul class="bs-masthead-links">
@@ -34,7 +34,7 @@
           <a href="{{ site.expo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Bootstrap Expo</a>
         </li>
       </ul>
-    </div>
+    </footer>
 
     <!-- JS and analytics only. -->
     {% include footer.html %}