diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 4b3dc23d565..6c88af845ee 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -109,8 +109,9 @@ namespace ts {
                 "umd": ModuleKind.UMD,
                 "es6": ModuleKind.ES2015,
                 "es2015": ModuleKind.ES2015,
+                "es2018": ModuleKind.ES2018
             }),
-            description: Diagnostics.Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015,
+            description: Diagnostics.Specify_module_code_generation_Colon_commonjs_amd_system_umd_es2015_or_es2018,
             paramType: Diagnostics.KIND,
         },
         {
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 5d7f570ef02..7397f278769 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -2569,7 +2569,7 @@
         "category": "Message",
         "code": 6015
     },
-    "Specify module code generation: 'commonjs', 'amd', 'system', 'umd' or 'es2015'.": {
+    "Specify module code generation: 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'es2018'.": {
         "category": "Message",
         "code": 6016
     },
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 8a19e4d62a1..c8b16130f29 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -3426,6 +3426,7 @@ namespace ts {
         UMD = 3,
         System = 4,
         ES2015 = 5,
+        ES2018 = 6
     }
 
     export const enum JsxEmit {