diff --git a/package.json b/package.json
index cc99517..74b2c11 100644
--- a/package.json
+++ b/package.json
@@ -24,8 +24,6 @@
     "extract-text-webpack-plugin": "^2.1.0",
     "htmlparser": "^1.7.7",
     "jed": "^1.1.1",
-    "jshint": "~2.9.1",
-    "jshint-loader": "~0.8.3",
     "po2json": "^0.4.5",
     "sass-loader": "^7.0.3",
     "sizzle": "^2.3.3",
diff --git a/src/app.jsx b/src/app.jsx
index a7f4aa6..f688c84 100644
--- a/src/app.jsx
+++ b/src/app.jsx
@@ -1,4 +1,3 @@
-/*jshint esversion: 6 */
 /*
  * This file is part of Cockpit.
  *
diff --git a/src/index.es6 b/src/index.es6
index fc25298..e444702 100644
--- a/src/index.es6
+++ b/src/index.es6
@@ -1,4 +1,3 @@
-/*jshint esversion: 6 */
 /*
  * This file is part of Cockpit.
  *
diff --git a/webpack.config.js b/webpack.config.js
index 1b64da4..dd78727 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -119,12 +119,6 @@ module.exports = {
     },
     module: {
         rules: [
-            {
-                enforce: 'pre',
-                exclude: /node_modules/,
-                loader: 'jshint-loader',
-                test: /\.js$/
-            },
             {
                 enforce: 'pre',
                 exclude: /node_modules/,
@@ -134,7 +128,7 @@ module.exports = {
             {
                 enforce: 'pre',
                 exclude: /node_modules/,
-                loader: 'jshint-loader?esversion=6',
+                loader: 'eslint-loader',
                 test: /\.es6$/
             },
             {