diff --git a/client-src/default/index.js b/client-src/default/index.js
index 489c762c9b..a38db7e820 100644
--- a/client-src/default/index.js
+++ b/client-src/default/index.js
@@ -61,6 +61,12 @@ const DEBUG = 'debug';
 const TRACE = 'trace';
 const SILENT = 'silent';
 
+// deprecated
+// TODO: remove these at major released
+// https://github.com/webpack/webpack-dev-server/pull/1825
+const WARNING = 'warning';
+const NONE = 'none';
+
 // Set the default log level
 log.setDefaultLevel(INFO);
 
@@ -121,6 +127,13 @@ const onSocketMsg = {
       case ERROR:
         log.setLevel(level);
         break;
+      // deprecated
+      case WARNING:
+        // loglevel's warning name is different from webpack's
+        log.setLevel('warn');
+        break;
+      // deprecated
+      case NONE:
       case SILENT:
         log.disableAll();
         break;
diff --git a/lib/options.json b/lib/options.json
index 0392953d43..89b125b7ff 100644
--- a/lib/options.json
+++ b/lib/options.json
@@ -37,7 +37,16 @@
       ]
     },
     "clientLogLevel": {
-      "enum": ["info", "warn", "error", "debug", "trace", "silent"]
+      "enum": [
+        "info",
+        "warn",
+        "error",
+        "debug",
+        "trace",
+        "silent",
+        "none",
+        "warning"
+      ]
     },
     "compress": {
       "type": "boolean"
diff --git a/test/options.test.js b/test/options.test.js
index b512216f4a..a32b5b96bc 100644
--- a/test/options.test.js
+++ b/test/options.test.js
@@ -120,8 +120,19 @@ describe('options', () => {
         failure: [false],
       },
       clientLogLevel: {
-        success: ['silent', 'info', 'error', 'warn', 'trace', 'debug'],
-        failure: ['whoops!', 'none', 'warning'],
+        success: [
+          'silent',
+          'info',
+          'error',
+          'warn',
+          'trace',
+          'debug',
+          // deprecated
+          'none',
+          // deprecated
+          'warning',
+        ],
+        failure: ['whoops!'],
       },
       compress: {
         success: [true],