diff --git a/Gruntfile.js b/Gruntfile.js
index 341c36ebda..ff878a6eac 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -272,24 +272,18 @@ module.exports = function (grunt) {
       }
     },
 
-    validation: {
+    htmllint: {
       options: {
-        charset: 'utf-8',
-        doctype: 'HTML5',
-        failHard: true,
-        reset: true,
-        relaxerror: [
-          'Element img is missing required attribute src.',
-          'Attribute autocomplete not allowed on element input at this point.',
-          'Attribute autocomplete not allowed on element button at this point.',
-          'Element div not allowed as child of element progress in this context.',
-          'Element thead not allowed as child of element table in this context.',
-          'Bad value tablist for attribute role on element nav.'
+        ignore: [
+          'Element “img” is missing required attribute “src”.',
+          'Bad value “X-UA-Compatible” for attribute “http-equiv” on element “meta”.',
+          'Attribute “autocomplete” not allowed on element “input” at this point.',
+          'Attribute “autocomplete” not allowed on element “button” at this point.',
+          'Element “div” not allowed as child of element “progress” in this context. (Suppressing further errors from this subtree.)',
+          'Consider using the “h1” element as a top-level heading only (all “h1” elements are treated as top-level headings by many screen readers and other tools).'
         ]
       },
-      files: {
-        src: '_gh_pages/**/*.html'
-      }
+      src: '_gh_pages/**/*.html'
     },
 
     watch: {
@@ -358,7 +352,7 @@ module.exports = function (grunt) {
   require('time-grunt')(grunt);
 
   // Docs HTML validation task
-  grunt.registerTask('validate-html', ['jekyll:docs', 'validation']);
+  grunt.registerTask('validate-html', ['jekyll:docs', 'htmllint']);
 
   var runSubset = function (subset) {
     return !process.env.TWBS_TEST || process.env.TWBS_TEST === subset;
diff --git a/package.json b/package.json
index 5cf0d04ddf..b93e08f0ac 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "grunt-contrib-watch": "~0.6.1",
     "grunt-csscomb": "~3.0.0",
     "grunt-exec": "~0.4.6",
-    "grunt-html-validation": "~0.1.18",
+    "grunt-html": "^2.0.0",
     "grunt-jekyll": "~0.4.2",
     "grunt-jscs": "~1.2.0",
     "grunt-postcss": "^0.3.0",