diff --git a/source/_includes/navigation.html b/source/_includes/navigation.html
index be85e23..f1f4b25 100644
--- a/source/_includes/navigation.html
+++ b/source/_includes/navigation.html
@@ -1,4 +1,4 @@
-<ul role="subscription" data-subscription="rss{% if site.subscribe_email %} email{% endif %}">
+<ul role=subscription data-subscription="rss{% if site.subscribe_email %} email{% endif %}">
   <li><a href="{{ site.subscribe_rss }}" rel="subscribe-rss" title="subscribe via RSS">RSS</a></li>
   {% if site.subscribe_email %}
     <li><a href="{{ site.subscribe_email }}" rel="subscribe-email" title="subscribe via email">Email</a></li>
@@ -10,7 +10,7 @@
     <input class="search" type="text" name="q" results="0" placeholder="Search"/>
   </fieldset>
 </form>
-<ul role="navigation">
+<ul role=main-navigation>
   <li><a href="{{ site.root }}/">Blog</a></li>
   <li><a href="{{ site.root }}/docs">Documentation</a></li>
   <li><a href="http://github.com/imathis/octopress">Source</a></li>
diff --git a/source/_layouts/default.html b/source/_layouts/default.html
index fdb60de..27739a1 100644
--- a/source/_layouts/default.html
+++ b/source/_layouts/default.html
@@ -1,7 +1,7 @@
 {% include head.html %}
 <body {% if page.body_id %} id="{{ page.body_id }}" {% endif %} {% if page.sidebar == false %} class="no-sidebar" {% endif %}>
   <header>{% include header.html %}</header>
-  <nav>{% include navigation.html %}</nav>
+  <nav role=navigation>{% include navigation.html %}</nav>
   <div id="main">
     <div id="content">
       {{ content }}
diff --git a/source/javascripts/octopress.js b/source/javascripts/octopress.js
index bdc4768..12ca23e 100644
--- a/source/javascripts/octopress.js
+++ b/source/javascripts/octopress.js
@@ -1,7 +1,7 @@
 function getNav(){
-  var mobileNav = $('body > nav fieldset[role=site-search]').after('<fieldset role="mobile-nav"></fieldset>').next().append('<select></select>');
+  var mobileNav = $('nav[role=navigation] fieldset[role=site-search]').after('<fieldset role="mobile-nav"></fieldset>').next().append('<select></select>');
   mobileNav.children('select').append('<option value="">Navigate&hellip;</option>');
-  $($('body > nav ul[role=main-nav] a')).each(function(link) {
+  $($('ul[role=main-navigation] a')).each(function(link) {
     mobileNav.children('select').append('<option value="'+link.href+'">&bull; '+link.text+'</option>')
   });
   mobileNav.children('select').bind('change', function(event){
