diff --git a/lib/docs/filters/modernizr/clean_html.rb b/lib/docs/filters/modernizr/clean_html.rb
index c37f0efa..8916c543 100644
--- a/lib/docs/filters/modernizr/clean_html.rb
+++ b/lib/docs/filters/modernizr/clean_html.rb
@@ -6,12 +6,12 @@ module Docs
           node.content = node.content
         end
 
-        css('> div', '> section').each do |node|
+        css('sub').each do |node|
           node.before(node.children).remove
         end
 
-        css('h3, h4').each do |node|
-          node.name = node.name.sub(/\d/) { |i| i.to_i - 1 }
+        css('td:nth-child(2)').each do |node|
+          node.name = node.previous_element.name = 'th'
         end
 
         doc
diff --git a/lib/docs/filters/modernizr/entries.rb b/lib/docs/filters/modernizr/entries.rb
index d2cb377a..d5d150bb 100644
--- a/lib/docs/filters/modernizr/entries.rb
+++ b/lib/docs/filters/modernizr/entries.rb
@@ -5,27 +5,14 @@ module Docs
         entries = []
 
         css('h3[id]').each do |node|
-          next unless name = node.content.strip[/\AModernizr\.\w+\(\)/]
+          next unless name = node.content.strip[/\AModernizr\..+/]
           entries << [name, node['id'], 'Modernizr']
         end
 
-        css('section[id]').each do |node|
-          next unless heading = node.at_css('h3')
-          next unless name = heading.content.strip[/\A(Modernizr\.)?\w+\(\)/]
-
-          heading['id'] = node['id']
-          node.remove_attribute('id')
-
-          name.prepend('Modernizr.') unless name.start_with?('Modernizr')
-          entries << [name, heading['id'], 'Modernizr']
-        end
-
-        css('h4[id^="features-"] + table').each do |table|
-          type = table.previous_element.content.strip
-          type << ' features' unless type.end_with?('features')
-
-          table.css('tbody th[id]').each do |node|
-            entries << [node.content, node['id'], type]
+        css('h2[id="features"] + table td:nth-child(2) b').each do |node|
+          node['id'] = node.content.parameterize
+          node.content.split(',').each do |name|
+            entries << [name, node['id'], 'Features']
           end
         end
 
diff --git a/lib/docs/scrapers/modernizr.rb b/lib/docs/scrapers/modernizr.rb
index 9299ed91..ee1a4bb5 100644
--- a/lib/docs/scrapers/modernizr.rb
+++ b/lib/docs/scrapers/modernizr.rb
@@ -2,17 +2,17 @@ module Docs
   class Modernizr < UrlScraper
     self.name = 'Modernizr'
     self.type = 'modernizr'
-    self.version = '2.8.3'
-    self.base_url = 'http://modernizr.com/docs/'
+    self.version = '3.1.0'
+    self.base_url = 'https://modernizr.com/docs/'
 
     html_filters.push 'modernizr/entries', 'modernizr/clean_html', 'title'
 
     options[:title] = 'Modernizr'
-    options[:container] = '#documentation'
+    options[:container] = '#main'
     options[:skip_links] = true
 
     options[:attribution] = <<-HTML
-      &copy; 2009&ndash;2014 Modernizr<br>
+      &copy; 2009&ndash;2015 Modernizr<br>
       Licensed under the MIT License.
     HTML
   end