diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86381299d122..c7bd85ca42d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,13 +34,20 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 # Changelog
 
-## [Unreleased]
+## [v0.42.5](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.42.5) - 2021-05-18
 
 ### Bug Fixes
 
 * [\#9235](https://github.com/cosmos/cosmos-sdk/pull/9235) CreateMembershipProof/CreateNonMembershipProof now returns an error
 if input key is empty, or input data contains empty key.
 * [\#9108](https://github.com/cosmos/cosmos-sdk/pull/9108) Fixed the bug with querying multisig account, which is not showing threshold and public_keys.
+* [\#9345](https://github.com/cosmos/cosmos-sdk/pull/9345) Fix ARM support.
+* [\#9040](https://github.com/cosmos/cosmos-sdk/pull/9040) Fix ENV variables binding to CLI flags for client config.
+
+### Features
+
+* [\#8953](https://github.com/cosmos/cosmos-sdk/pull/8953) Add the `config` CLI subcommand back to the SDK, which saves client-side configuration in a `client.toml` file.
+
 
 ## [v0.42.4](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.42.4) - 2021-04-08
 
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 931184a53c24..aee920607c24 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,5 +1,25 @@
-# Cosmos SDK v0.42.4 "Stargate" Release Notes
+# Cosmos SDK v0.42.5 "Stargate" Release Notes
 
-This release includes an important Tendermint update that fixes a security issue with Tendermint light clients. For more information, see [Tendermint v0.34.9 release notes](https://github.com/tendermint/tendermint/blob/v0.34.9/CHANGELOG.md#v0.34.9).
+This release includes various minor bugfixes and improvments, including:
 
-See the [Cosmos SDK v0.42.4 milestone](https://github.com/cosmos/cosmos-sdk/milestone/43?closed=1) on our issue tracker for further details.
+- Fix support for building the Cosmos SDK on ARM architectures,
+- Fix the `[appd] keys show/list` CLI subcommands for multisigs,
+- Internal code performance improvment.
+
+It also introduces one new feature: adding the `[appd] config` subcommand back to the SDK.
+
+See the [Cosmos SDK v0.42.5 milestone](https://github.com/cosmos/cosmos-sdk/milestone/44?closed=1) on our issue tracker for the exhaustive list of all changes.
+
+### The `config` Subcommand
+
+One new feature introduced in the Stargate series was the merging of the two CLI binaries `[appd]` and `[appcli]` into one single application binary. In this process, the `[appcli] config` subcommand, which was used to save client-side configuration into a TOML file, was removed.
+
+Due to [popular demand](https://github.com/cosmos/cosmos-sdk/issues/8529), we have introduced this feature back to the SDK, under the `[appd] config` subcommand. The functionality is as follows:
+
+- `[appd] config`: Output all client-side configuration.
+- `[appd] config [config-name]`: Get the given configuration (e.g. `keyring-backend` or `node-id`).
+- `[appd] config [config-name] [config-value]`: Set and persist the given configuration with the new value.
+
+All configurations are persisted to the filesystem, under the path `$APP_HOME/config/client.toml`. For the list of all possible client-side configurations, please have a look at this `client.toml` file, as it is heavily commented.
+
+Environment variables binding to client-side configuration also works. For example, the command `KEYRING_BACKEND=os [appd] tx bank send ...` will bind ENV variable to the `keyring-backend` config. The order or precedence for config is: `flags > env vars > client.toml file`.