diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75223f0..1ee0f0b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@
 * the positional argument `GIT_COMMIT_ID` becomes an optional argument with the named parameter ` --git-commit-id [GIT_COMMIT_ID]`
 * the `lintmigrations` command takes now two positional arguments: `lintmigrations [app_label] [migration_name]`
 
+New features:
+* raise warning when create or dropping an index in a non-concurrent manner using postgresql
+
 Miscellaneous:
 * Add complete and working support for `toml` configuration files
 * Add code coverage to the linter
diff --git a/docs/incompatibilities.md b/docs/incompatibilities.md
index 4f7b0ef..2518a1e 100644
--- a/docs/incompatibilities.md
+++ b/docs/incompatibilities.md
@@ -39,3 +39,5 @@ You can ignore check through the `--exclude-migration-test` option and specifyin
 |`RUNPYTHON_MODEL_IMPORT`           | Missing apps.get_model() calls for model
 |`RUNPYTHON_MODEL_VARIABLE_NAME`    | The model variable name is different from the model class itself
 |`RUNSQL_REVERSIBLE`                | RunSQL data migration is not reversible (missing reverse SQL)
+|`CREATE_INDEX`                     | Creating an index without the concurrent keyword will lock the table and may generate downtime
+|`DROP_INDEX`                       | Dropping an index without the concurrent keyword will lock the table and may generate downtime