diff --git a/README.md b/README.md
index 0a11efa..29cd0ad 100644
--- a/README.md
+++ b/README.md
@@ -30,9 +30,9 @@ You can insert single line comment blocks for languages with `//`, `#`, or `;` s
 
 | Comment Style | Language Support |
 | ------- | ------- |
-| `/** */` | C, C++, C#, CSS, Go, Groovy, Java, Less, Objective C/C++, PHP, Sass, Rust, Swift |
+| `/** */` | C, C++, C#, CSS, Go, Groovy, Java, Kotlin, Less, Objective C/C++, PHP, Sass, Rust, Swift |
 | `/*! */` | C, C++ |
-| `//`, `///` | C, C++, C#, F#, Go, Groovy, Java, JavaScript, Less, Objective C/C++, PHP, Rust, Sass, Swift, TypeScript |
+| `//`, `///` | C, C++, C#, F#, Go, Groovy, Java, JavaScript, Kotlin, Less, Objective C/C++, PHP, Rust, Sass, Swift, TypeScript |
 | `#` | CoffeeScript, Dockerfile, Makefile, Perl, PowerShell, Python, R, Ruby, YAML |
 | `;` | Clojure |
 
diff --git a/language-configuration/multi-line-configuration.json b/language-configuration/multi-line-configuration.json
index f41886b..fccbc46 100644
--- a/language-configuration/multi-line-configuration.json
+++ b/language-configuration/multi-line-configuration.json
@@ -7,6 +7,7 @@
     "go",
     "groovy",
     "java",
+    "kotlin",
     "less",
     "objective-c",
     "objective-cpp",
diff --git a/language-configuration/single-line-configuration.json b/language-configuration/single-line-configuration.json
index fce0efd..87b4c01 100644
--- a/language-configuration/single-line-configuration.json
+++ b/language-configuration/single-line-configuration.json
@@ -8,6 +8,7 @@
     "groovy",
     "java",
     "javascript",
+    "kotlin",
     "less",
     "objective-c",
     "objective-cpp",