diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18b87cd..095a556 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ### HEAD
+* Switch `div.main` to `main` element now that Modernizr uses the latest HTML5 Shiv
 * Update to Modernizr 2.7.0
 * Don't run JSHint on plugins (`assets/js/plugins/`)
 * Disable warnings about undefined variables (JSHint)
diff --git a/base.php b/base.php
index 28eecad..af41d3c 100644
--- a/base.php
+++ b/base.php
@@ -19,9 +19,9 @@
 
   <div class="wrap container" role="document">
     <div class="content row">
-      <div class="main <?php echo roots_main_class(); ?>" role="main">
+      <main class="main <?php echo roots_main_class(); ?>" role="main">
         <?php include roots_template_path(); ?>
-      </div><!-- /.main -->
+      </main><!-- /.main -->
       <?php if (roots_display_sidebar()) : ?>
         <aside class="sidebar <?php echo roots_sidebar_class(); ?>" role="complementary">
           <?php include roots_sidebar_path(); ?>