diff --git a/CHANGELOG.md b/CHANGELOG.md
index a17d043cee3..196f6690048 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,14 +2,26 @@
 
 ## [Unreleased](https://github.com/CosmWasm/wasmd/tree/HEAD)
 
-**Implemented Enhancements:**
+[Full Changelog](https://github.com/CosmWasm/wasmd/compare/v0.21.0...HEAD)
+
+## [v0.21.0](https://github.com/CosmWasm/wasmd/tree/v0.21.0) (2021-11-17)
+
+[Full Changelog](https://github.com/CosmWasm/wasmd/compare/v0.21.0...v0.20.0)
 
+**Fixed bugs + Api Breaking:**
+- Prevent infinite gas consumption in simulation queries [\#670](https://github.com/CosmWasm/wasmd/issues/670)
+- Amino JSON representation of inner message in Msg{Instantiate,Migrate,Execute}Contract [\#642](https://github.com/CosmWasm/wasmd/issues/642)
+
+**Implemented Enhancements:**
+- Add Benchmarks to compare with native modules [\#635](https://github.com/CosmWasm/wasmd/issues/635)
+- Document M1 is not supported [\#653](https://github.com/CosmWasm/wasmd/issues/653)
+- Open read access to sequences [\#669](https://github.com/CosmWasm/wasmd/pull/669)
 - Remove unused flags from command prompt for storing contract [\#647](https://github.com/CosmWasm/wasmd/issues/647)
 - Ran `make format` [\#649](https://github.com/CosmWasm/wasmd/issues/649)
 - Add golangci lint check to circleci jobs [\620](https://github.com/CosmWasm/wasmd/issues/620)
 - Updated error log statements in initGenesis for easier debugging: [\#643](https://github.com/CosmWasm/wasmd/issues/643)
-
-[Full Changelog](https://github.com/CosmWasm/wasmd/compare/v0.20.0...HEAD)
+- Bump github.com/cosmos/iavl from 0.17.1 to 0.17.2 [\#673](https://github.com/CosmWasm/wasmd/pull/673)
+- Bump github.com/rs/zerolog from 1.25.0 to 1.26.0 [\#666](https://github.com/CosmWasm/wasmd/pull/666)
 
 ## [v0.20.0](https://github.com/CosmWasm/wasmd/tree/v0.20.0) (2021-10-08)
 
diff --git a/README.md b/README.md
index 66e1481c9d2..36d0b398214 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,7 @@ compatibility list:
 
 | wasmd | cosmwasm-vm | cosmwasm-std |
 | ----- | ----------- | ------------ |
+| 0.21  | 1.0.0-beta | 1.0.0-beta  |
 | 0.20  | 1.0.0-beta | 1.0.0-beta  |
 | 0.19  | 0.16        | 0.16         |
 | 0.18  | 0.16        | 0.16         |
@@ -183,8 +184,12 @@ Examples:
 * [`wasmd`](./Makefile#L50-L55) is a generic, permissionless version using the `cosmos` bech32 prefix
 
 ## Genesis Configuration
-
-@alpe we should document all the genesis config for x/wasm even more.
+We strongly suggest **to limit the max block gas in the genesis** and not use the default value (`-1` for infinite).
+```json
+  "consensus_params": {
+    "block": {
+      "max_gas": "SET_YOUR_MAX_VALUE",  
+```
 
 Tip: if you want to lock this down to a permisisoned network, the following script can edit the genesis file
 to only allow permissioned use of code upload or instantiating. (Make sure you set `app.ProposalsEnabled=true`