diff --git a/README.md b/README.md
index aa722cb8ed..a4d97c03ad 100644
--- a/README.md
+++ b/README.md
@@ -263,6 +263,9 @@ Go to <kbd>File</kbd> -> <kbd>Settings...</kbd> -> <kbd>Editor</kbd>
   - check `Optimize imports on the fly (for current project)`.
 - <kbd>Code Style</kbd> -> <kbd>Kotlin</kbd>
   - <kbd>Set from...</kbd> -> <kbd>Predefined style</kbd> -> <kbd>Kotlin style guide</kbd> (Kotlin plugin 1.2.20+).
+  - open <kbd>Code Generation</kbd> tab
+    - uncheck `Line comment at first column`;
+    - select `Add a space at comment start`.
   - open <kbd>Imports</kbd> tab
     - select `Use single name import` (all of them);
     - remove `import java.util.*` from `Packages to Use Import with '*'`.
diff --git a/ktlint/src/main/resources/config/codestyles/ktlint.xml b/ktlint/src/main/resources/config/codestyles/ktlint.xml
index e73bb3bae6..820c15be19 100644
--- a/ktlint/src/main/resources/config/codestyles/ktlint.xml
+++ b/ktlint/src/main/resources/config/codestyles/ktlint.xml
@@ -15,6 +15,8 @@
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
     <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
     <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+    <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+    <option name="LINE_COMMENT_ADD_SPACE" value="true" />
     <indentOptions>
       <option name="INDENT_SIZE" value="4" />
       <option name="CONTINUATION_INDENT_SIZE" value="8" />