diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
index 36f809928..4ad90b0fe 100644
--- a/CHANGELOG_PENDING.md
+++ b/CHANGELOG_PENDING.md
@@ -26,6 +26,8 @@ IMPROVEMENTS:
 - [docs] Lint documentation with `write-good` and `stop-words`.
 - [scripts] Added json2wal tool, which is supposed to help our users restore
   corrupted WAL files and compose test WAL files (@bradyjoestar)
+- [config] Replace db_path with db_dir from automatically generated configuration files.
+  Issue reported to Cosmos SDK ([#1712](https://github.com/cosmos/cosmos-sdk/issues/1712))
 
 BUG FIXES:
 - [mempool] No longer possible to fill up linked list without getting caching
diff --git a/config/toml.go b/config/toml.go
index c85609b66..255fa2b52 100644
--- a/config/toml.go
+++ b/config/toml.go
@@ -81,7 +81,7 @@ fast_sync = {{ .BaseConfig.FastSync }}
 db_backend = "{{ .BaseConfig.DBBackend }}"
 
 # Database directory
-db_path = "{{ js .BaseConfig.DBPath }}"
+db_dir = "{{ js .BaseConfig.DBPath }}"
 
 # Output level for logging, including package level options
 log_level = "{{ .BaseConfig.LogLevel }}"
diff --git a/docs/tendermint-core/configuration.md b/docs/tendermint-core/configuration.md
index 5b5c4a29a..099b9dbd8 100644
--- a/docs/tendermint-core/configuration.md
+++ b/docs/tendermint-core/configuration.md
@@ -34,7 +34,7 @@ fast_sync = true
 db_backend = "leveldb"
 
 # Database directory
-db_path = "data"
+db_dir = "data"
 
 # Output level for logging
 log_level = "state:info,*:error"