diff --git a/.changelog/epilogue.md b/.changelog/epilogue.md
index ad4b22bcf..bcdec75d7 100644
--- a/.changelog/epilogue.md
+++ b/.changelog/epilogue.md
@@ -96,7 +96,7 @@ below.
 [#836]: https://github.com/informalsystems/tendermint-rs/issues/836
 [#839]: https://github.com/informalsystems/tendermint-rs/pull/839
 [#855]: https://github.com/informalsystems/tendermint-rs/pull/855
-[ABCI]: https://docs.tendermint.com/master/spec/abci/
+[ABCI]: https://github.com/tendermint/tendermint/tree/main/spec/abci/
 [`ibc-rs`]: https://github.com/informalsystems/ibc-rs
 [`rustls`]: https://github.com/ctz/rustls
 
@@ -188,7 +188,7 @@ Client's correct and reliable operation.
 
 This release is a significant breaking upgrade from v0.16.0 that primarily
 targets compatibility with
-[Tendermint v0.34](https://github.com/tendermint/tendermint/blob/master/UPGRADING.md#v0340)
+[Tendermint v0.34](https://github.com/tendermint/tendermint/blob/main/UPGRADING.md#v0340)
 and the [Cosmos Stargate release](https://stargate.cosmos.network/).
 
 To highlight some of the major changes over the course of 3 release candidates
@@ -197,7 +197,7 @@ and this release, we have:
 * Provided Tendermint v0.34.0 compatibility.
 * Supported the development of [ibc-rs](https://github.com/informalsystems/ibc-rs/).
 * Improved our model-based testing to provide complex test cases for the
-  [Light Client](https://github.com/informalsystems/tendermint-rs/tree/master/light-client#testing).
+  [Light Client](https://github.com/informalsystems/tendermint-rs/tree/main/light-client#testing).
 * Refactored our serialization infrastructure to remove all Amino types and
   ensure Protobuf compatibility (see the [proto crate](./proto)). This includes
   a lot of work towards clearly separating our domain types from their
@@ -206,7 +206,7 @@ and this release, we have:
   Tendermint full node.
 * Started work towards offering a WASM-based Tendermint Light Client.
 * Introduced a WebSocket-based RPC client for interacting with the
-  [Tendermint RPC](https://docs.tendermint.com/master/rpc/), including event
+  [Tendermint RPC](https://docs.tendermint.com/v0.34.x/rpc/), including event
   subscription.
 
 Please see the following detailed release notes, as well as the crate
@@ -263,7 +263,7 @@ documentation, for further details.
 - `[light-client]` Only require Tokio when `rpc-client` feature is enabled ([#425])
 - `[rpc]` A `WebSocketClient` is now provided to facilitate event
   subscription for a limited range of RPC events over a WebSocket connection.
-  See the [Tendermint `/subscribe` endpoint's](https://docs.tendermint.com/master/rpc/#/Websocket/subscribe)
+  See the [Tendermint `/subscribe` endpoint's](https://docs.tendermint.com/v0.34.x/rpc/#/Websocket/subscribe)
   and the `tendermint-rpc` crate's docs for more details ([#516])
 - `[rpc]` The subscription client interface provides a structured `Query`
   mechanism to help ensure compile-time validity of subscription queries.
@@ -350,7 +350,7 @@ documentation, for further details.
 [#739]: https://github.com/informalsystems/tendermint-rs/issues/739
 [#745]: https://github.com/informalsystems/tendermint-rs/issues/745
 [#752]: https://github.com/informalsystems/tendermint-rs/pull/752
-[P2P layer]: https://github.com/informalsystems/tendermint-rs/tree/master/p2p
+[P2P layer]: https://github.com/informalsystems/tendermint-rs/tree/main/p2p
 
 
 ## v0.16.0
@@ -394,8 +394,8 @@ preparing for compatibility with Tendermint Core v0.34 ([#508])
 
 - [light-client] Fix to reject headers from the future ([#474])
 
-[light-client-dir]: https://github.com/informalsystems/tendermint-rs/tree/master/light-client
-[testgen-dir]: https://github.com/informalsystems/tendermint-rs/tree/master/testgen
+[light-client-dir]: https://github.com/informalsystems/tendermint-rs/tree/main/light-client
+[testgen-dir]: https://github.com/informalsystems/tendermint-rs/tree/main/testgen
 
 [#466]: https://github.com/informalsystems/tendermint-rs/pull/466
 [#468]: https://github.com/informalsystems/tendermint-rs/pull/468
@@ -457,8 +457,8 @@ and [ADR-007].
 [#441]: https://github.com/informalsystems/tendermint-rs/pull/441
 [#451]: https://github.com/informalsystems/tendermint-rs/pull/451
 
-[ADR-006]: https://github.com/informalsystems/tendermint-rs/blob/master/docs/architecture/adr-006-light-client-refactor.md
-[ADR-007]: https://github.com/informalsystems/tendermint-rs/blob/master/docs/architecture/adr-007-light-client-supervisor-ergonomics.md
+[ADR-006]: https://github.com/informalsystems/tendermint-rs/blob/main/docs/architecture/adr-006-light-client-refactor.md
+[ADR-007]: https://github.com/informalsystems/tendermint-rs/blob/main/docs/architecture/adr-007-light-client-supervisor-ergonomics.md
 
 [lite-dir]: ./tendermint/src/lite
 [light-client-dir]: ./light-client
@@ -523,9 +523,9 @@ CI:
 
 [0.14.0]: https://github.com/informalsystems/tendermint-rs/pull/347
 [v0.33.x]: https://github.com/tendermint/tendermint/blob/v0.33.5/CHANGELOG.md#v0335
-[tendermint-rpc]: https://github.com/informalsystems/tendermint-rs/tree/master/rpc#tendermint-rpc
-[lite]: https://github.com/informalsystems/tendermint-rs/tree/master/tendermint/src/lite
-[light-client-dir]: https://github.com/informalsystems/tendermint-rs/tree/master/light-client
+[tendermint-rpc]: https://github.com/informalsystems/tendermint-rs/tree/main/rpc#tendermint-rpc
+[lite]: https://github.com/informalsystems/tendermint-rs/tree/main/tendermint/src/lite
+[light-client-dir]: https://github.com/informalsystems/tendermint-rs/tree/main/light-client
 
 ## [0.13.0] (2020-04-20)
 
@@ -700,7 +700,7 @@ This release is compatible with [tendermint v0.28]
 - Initial release
 
 [0.10.0]: https://github.com/tendermint/kms/pull/328
-[tendermint v0.32]: https://github.com/tendermint/tendermint/blob/master/CHANGELOG.md#v0320
+[tendermint v0.32]: https://github.com/tendermint/tendermint/blob/main/CHANGELOG.md#v0320
 [#326]: https://github.com/tendermint/kms/pull/326
 [#324]: https://github.com/tendermint/kms/pull/324
 [#315]: https://github.com/tendermint/kms/pull/315
@@ -723,15 +723,15 @@ This release is compatible with [tendermint v0.28]
 [#235]: https://github.com/tendermint/kms/pull/235
 [#234]: https://github.com/tendermint/kms/pull/234
 [0.6.0]: https://github.com/tendermint/kms/pull/229
-[tendermint v0.31]: https://github.com/tendermint/tendermint/blob/master/CHANGELOG.md#v0310
+[tendermint v0.31]: https://github.com/tendermint/tendermint/blob/main/CHANGELOG.md#v0310
 [#228]: https://github.com/tendermint/kms/pull/228
 [0.5.0]: https://github.com/tendermint/kms/pull/220
-[tendermint v0.30]: https://github.com/tendermint/tendermint/blob/master/CHANGELOG.md#v0300
+[tendermint v0.30]: https://github.com/tendermint/tendermint/blob/main/CHANGELOG.md#v0300
 [#219]: https://github.com/tendermint/kms/pull/219
 [#205]: https://github.com/tendermint/kms/pull/219
 [#181]: https://github.com/tendermint/kms/pull/181
-[tendermint v0.29]: https://github.com/tendermint/tendermint/blob/master/CHANGELOG.md#v0290
-[tendermint v0.28]: https://github.com/tendermint/tendermint/blob/master/CHANGELOG.md#v0280
+[tendermint v0.29]: https://github.com/tendermint/tendermint/blob/main/CHANGELOG.md#v0290
+[tendermint v0.28]: https://github.com/tendermint/tendermint/blob/main/CHANGELOG.md#v0280
 [#30]: https://github.com/interchainio/tendermint-rs/pull/30
 [#16]: https://github.com/interchainio/tendermint-rs/pull/16
 [#15]: https://github.com/interchainio/tendermint-rs/pull/15
diff --git a/.changelog/v0.22.0/features/832-consensus-params.md b/.changelog/v0.22.0/features/832-consensus-params.md
index c7a1d3e6b..52b3c4b10 100644
--- a/.changelog/v0.22.0/features/832-consensus-params.md
+++ b/.changelog/v0.22.0/features/832-consensus-params.md
@@ -1,3 +1,3 @@
 - `[tendermint-rpc]` Add support for the `/consensus_params` RPC endpoint. See
-  <https://docs.tendermint.com/master/rpc/\#/Info/consensus_params> for details
+  <https://docs.tendermint.com/v0.34.x/rpc/\#/Info/consensus_params> for details
   ([#832](https://github.com/informalsystems/tendermint-rs/issues/832))
diff --git a/.changelog/v0.22.0/features/859-rpc-query-parsing.md b/.changelog/v0.22.0/features/859-rpc-query-parsing.md
index efeda0292..e2e9dcdd1 100644
--- a/.changelog/v0.22.0/features/859-rpc-query-parsing.md
+++ b/.changelog/v0.22.0/features/859-rpc-query-parsing.md
@@ -2,6 +2,6 @@
   `/tx_search` endpoints) has been reintroduced. This allows for client-side
   validation of queries prior to submitting them to a remote Tendermint node. An
   example of how to use this is available in the `tendermint-rpc` CLI (see [the
-  README](https://github.com/informalsystems/tendermint-rs/tree/master/rpc#cli)
+  README](https://github.com/informalsystems/tendermint-rs/tree/main/rpc#cli)
   for details).
   ([#859](https://github.com/informalsystems/tendermint-rs/issues/859))
diff --git a/.changelog/v0.23.0/features/832-block-search.md b/.changelog/v0.23.0/features/832-block-search.md
index 49f5171cb..20ec1f816 100644
--- a/.changelog/v0.23.0/features/832-block-search.md
+++ b/.changelog/v0.23.0/features/832-block-search.md
@@ -1,3 +1,3 @@
 - `[tendermint-rpc]` Add support for the `/block_search` RPC endpoint. See
-  <https://docs.tendermint.com/master/rpc/\#/Info/block_search> for details
+  <https://docs.tendermint.com/v0.34.x/rpc/\#/Info/block_search> for details
   ([#832](https://github.com/informalsystems/tendermint-rs/issues/832))
diff --git a/.changelog/v0.23.8/summary.md b/.changelog/v0.23.8/summary.md
index 20ec8d0cb..8071fda6d 100644
--- a/.changelog/v0.23.8/summary.md
+++ b/.changelog/v0.23.8/summary.md
@@ -2,7 +2,7 @@
 
 This release focuses on ensuring compatibility with Tendermint v0.34.20, which
 introduces a [prioritized
-mempool](https://github.com/tendermint/tendermint/blob/master/docs/architecture/adr-067-mempool-refactor.md).
+mempool](https://github.com/tendermint/tendermint/blob/main/docs/architecture/adr-067-mempool-refactor.md).
 As per the release notes for `v0.23.8-pre.1`, this has a minor additive impact
 on the ABCI and RPC interfaces in the fields that the `CheckTx` response
 contains.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b017ecb5d..9fee19a47 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ on:
     paths-ignore:
       - "docs/**"
     branches:
-      - master
+      - main
       - 'v*.*.*'
 jobs:
   cleanup-runs:
@@ -16,7 +16,7 @@ jobs:
       - uses: rokroskar/workflow-run-cleanup-action@master
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-    if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
+    if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main'"
 
   tendermint:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/no-std.yaml b/.github/workflows/no-std.yaml
index 3efe54e6f..3bd678a29 100644
--- a/.github/workflows/no-std.yaml
+++ b/.github/workflows/no-std.yaml
@@ -2,7 +2,7 @@ name: no_std check
 on:
   pull_request: {}
   push:
-    branches: master
+    branches: main
 
 jobs:
   check-no-std-panic-conflict:
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 32384a574..7a641a326 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -7,7 +7,7 @@ on:
     paths-ignore:
       - "docs/**"
     branches:
-      - master
+      - main
       - 'v*.*.*'
 jobs:
   cleanup-runs:
@@ -16,7 +16,7 @@ jobs:
       - uses: rokroskar/workflow-run-cleanup-action@master
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-    if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
+    if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main'"
 
   fmt:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 33fab6e2d..4c665f6bb 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,7 +7,7 @@ on:
     paths-ignore:
       - "docs/**"
     branches:
-      - master
+      - main
       - 'v*.*.*'
 jobs:
   cleanup-runs:
@@ -16,7 +16,7 @@ jobs:
       - uses: rokroskar/workflow-run-cleanup-action@master
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-    if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
+    if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main'"
 
   default-features:
     runs-on: ubuntu-latest
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f945b14b6..aadbd61b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,7 +30,7 @@ resolved.
 
 This release focuses on ensuring compatibility with Tendermint v0.34.20, which
 introduces a [prioritized
-mempool](https://github.com/tendermint/tendermint/blob/master/docs/architecture/adr-067-mempool-refactor.md).
+mempool](https://github.com/tendermint/tendermint/blob/main/docs/architecture/adr-067-mempool-refactor.md).
 As per the release notes for `v0.23.8-pre.1`, this has a minor additive impact
 on the ABCI and RPC interfaces in the fields that the `CheckTx` response
 contains.
@@ -66,12 +66,12 @@ Pre-releases will continue along this line until v0.34.20 is released.
 
 ### FEATURES
 
-- `[tendermint-rpc]` Update `broadcast_tx_*` result to include
-  prioritized new mempool fields available from v0.34.20-rc0
-  ([#1148](https://github.com/informalsystems/tendermint-rs/issues/1148))
 - `[tendermint-proto]` Regenerate protos from Tendermint
   v0.34.20-rc0, including prioritized mempool fields in `ResponseCheckTx`
   ([#1148](https://github.com/informalsystems/tendermint-rs/issues/1148))
+- `[tendermint-rpc]` Update `broadcast_tx_*` result to include
+  prioritized new mempool fields available from v0.34.20-rc0
+  ([#1148](https://github.com/informalsystems/tendermint-rs/issues/1148))
 
 ## v0.23.7
 
@@ -228,23 +228,23 @@ not yet support `no_std`.
 - Upgraded Prost to the official v0.9 release to finally resolve the security
   issue introduced by v0.7
   ([#925](https://github.com/informalsystems/tendermint-rs/issues/925))
-- `[tendermint, tendermint-config]` The `tendermint::config`
-  module has now been broken out into its own crate (`tendermint-
-  config`) to help towards facilitating `no_std` compatibility
-  ([#983](https://github.com/informalsystems/tendermint-rs/issues/983))
-- `[tendermint]` The `tendermint::node::info::OtherInfo::rpc_address`
-  field type has been changed from `tendermint::net::Address`
-  to `String` toward facilitating `no_std` compatibility
-  ([#983](https://github.com/informalsystems/tendermint-rs/issues/983))
 - `[tendermint]` The `tendermint::node::info::ListenAddress::to_net_address`
   method was replaced with a simple `as_str` method toward facilitating
   `no_std` compatibility ([#983](https://github.com/informalsystems/tendermint-
   rs/issues/983))
+- `[tendermint]` The `tendermint::node::info::OtherInfo::rpc_address`
+  field type has been changed from `tendermint::net::Address`
+  to `String` toward facilitating `no_std` compatibility
+  ([#983](https://github.com/informalsystems/tendermint-rs/issues/983))
+- `[tendermint, tendermint-config]` The `tendermint::config`
+  module has now been broken out into its own crate (`tendermint-
+  config`) to help towards facilitating `no_std` compatibility
+  ([#983](https://github.com/informalsystems/tendermint-rs/issues/983))
 
 ### FEATURES
 
 - `[tendermint-rpc]` Add support for the `/block_search` RPC endpoint. See
-  <https://docs.tendermint.com/master/rpc/\#/Info/block_search> for details
+  <https://docs.tendermint.com/v0.34.x/rpc/\#/Info/block_search> for details
   ([#832](https://github.com/informalsystems/tendermint-rs/issues/832))
 
 ## v0.22.0
@@ -299,13 +299,13 @@ See below for more specific detail as to what has changed in this release.
 ### FEATURES
 
 - `[tendermint-rpc]` Add support for the `/consensus_params` RPC endpoint. See
-  <https://docs.tendermint.com/master/rpc/\#/Info/consensus_params> for details
+  <https://docs.tendermint.com/v0.34.x/rpc/\#/Info/consensus_params> for details
   ([#832](https://github.com/informalsystems/tendermint-rs/issues/832))
 - `[tendermint-rpc]` Runtime query parsing (relevant to the `/subscribe` and
   `/tx_search` endpoints) has been reintroduced. This allows for client-side
   validation of queries prior to submitting them to a remote Tendermint node. An
   example of how to use this is available in the `tendermint-rpc` CLI (see [the
-  README](https://github.com/informalsystems/tendermint-rs/tree/master/rpc#cli)
+  README](https://github.com/informalsystems/tendermint-rs/tree/main/rpc#cli)
   for details).
   ([#859](https://github.com/informalsystems/tendermint-rs/issues/859))
 - `[tendermint, tendermint-light-client]` Add support for Secp256k1 signatures
@@ -529,7 +529,7 @@ below.
 [#836]: https://github.com/informalsystems/tendermint-rs/issues/836
 [#839]: https://github.com/informalsystems/tendermint-rs/pull/839
 [#855]: https://github.com/informalsystems/tendermint-rs/pull/855
-[ABCI]: https://docs.tendermint.com/master/spec/abci/
+[ABCI]: https://github.com/tendermint/tendermint/tree/main/spec/abci/
 [`ibc-rs`]: https://github.com/informalsystems/ibc-rs
 [`rustls`]: https://github.com/ctz/rustls
 
@@ -621,7 +621,7 @@ Client's correct and reliable operation.
 
 This release is a significant breaking upgrade from v0.16.0 that primarily
 targets compatibility with
-[Tendermint v0.34](https://github.com/tendermint/tendermint/blob/master/UPGRADING.md#v0340)
+[Tendermint v0.34](https://github.com/tendermint/tendermint/blob/main/UPGRADING.md#v0340)
 and the [Cosmos Stargate release](https://stargate.cosmos.network/).
 
 To highlight some of the major changes over the course of 3 release candidates
@@ -630,7 +630,7 @@ and this release, we have:
 * Provided Tendermint v0.34.0 compatibility.
 * Supported the development of [ibc-rs](https://github.com/informalsystems/ibc-rs/).
 * Improved our model-based testing to provide complex test cases for the
-  [Light Client](https://github.com/informalsystems/tendermint-rs/tree/master/light-client#testing).
+  [Light Client](https://github.com/informalsystems/tendermint-rs/tree/main/light-client#testing).
 * Refactored our serialization infrastructure to remove all Amino types and
   ensure Protobuf compatibility (see the [proto crate](./proto)). This includes
   a lot of work towards clearly separating our domain types from their
@@ -639,7 +639,7 @@ and this release, we have:
   Tendermint full node.
 * Started work towards offering a WASM-based Tendermint Light Client.
 * Introduced a WebSocket-based RPC client for interacting with the
-  [Tendermint RPC](https://docs.tendermint.com/master/rpc/), including event
+  [Tendermint RPC](https://docs.tendermint.com/v0.34.x/rpc/), including event
   subscription.
 
 Please see the following detailed release notes, as well as the crate
@@ -696,7 +696,7 @@ documentation, for further details.
 - `[light-client]` Only require Tokio when `rpc-client` feature is enabled ([#425])
 - `[rpc]` A `WebSocketClient` is now provided to facilitate event
   subscription for a limited range of RPC events over a WebSocket connection.
-  See the [Tendermint `/subscribe` endpoint's](https://docs.tendermint.com/master/rpc/#/Websocket/subscribe)
+  See the [Tendermint `/subscribe` endpoint's](https://docs.tendermint.com/v0.34.x/rpc/#/Websocket/subscribe)
   and the `tendermint-rpc` crate's docs for more details ([#516])
 - `[rpc]` The subscription client interface provides a structured `Query`
   mechanism to help ensure compile-time validity of subscription queries.
@@ -783,7 +783,7 @@ documentation, for further details.
 [#739]: https://github.com/informalsystems/tendermint-rs/issues/739
 [#745]: https://github.com/informalsystems/tendermint-rs/issues/745
 [#752]: https://github.com/informalsystems/tendermint-rs/pull/752
-[P2P layer]: https://github.com/informalsystems/tendermint-rs/tree/master/p2p
+[P2P layer]: https://github.com/informalsystems/tendermint-rs/tree/main/p2p
 
 
 ## v0.16.0
@@ -827,8 +827,8 @@ preparing for compatibility with Tendermint Core v0.34 ([#508])
 
 - [light-client] Fix to reject headers from the future ([#474])
 
-[light-client-dir]: https://github.com/informalsystems/tendermint-rs/tree/master/light-client
-[testgen-dir]: https://github.com/informalsystems/tendermint-rs/tree/master/testgen
+[light-client-dir]: https://github.com/informalsystems/tendermint-rs/tree/main/light-client
+[testgen-dir]: https://github.com/informalsystems/tendermint-rs/tree/main/testgen
 
 [#466]: https://github.com/informalsystems/tendermint-rs/pull/466
 [#468]: https://github.com/informalsystems/tendermint-rs/pull/468
@@ -890,8 +890,8 @@ and [ADR-007].
 [#441]: https://github.com/informalsystems/tendermint-rs/pull/441
 [#451]: https://github.com/informalsystems/tendermint-rs/pull/451
 
-[ADR-006]: https://github.com/informalsystems/tendermint-rs/blob/master/docs/architecture/adr-006-light-client-refactor.md
-[ADR-007]: https://github.com/informalsystems/tendermint-rs/blob/master/docs/architecture/adr-007-light-client-supervisor-ergonomics.md
+[ADR-006]: https://github.com/informalsystems/tendermint-rs/blob/main/docs/architecture/adr-006-light-client-refactor.md
+[ADR-007]: https://github.com/informalsystems/tendermint-rs/blob/main/docs/architecture/adr-007-light-client-supervisor-ergonomics.md
 
 [lite-dir]: ./tendermint/src/lite
 [light-client-dir]: ./light-client
@@ -956,9 +956,9 @@ CI:
 
 [0.14.0]: https://github.com/informalsystems/tendermint-rs/pull/347
 [v0.33.x]: https://github.com/tendermint/tendermint/blob/v0.33.5/CHANGELOG.md#v0335
-[tendermint-rpc]: https://github.com/informalsystems/tendermint-rs/tree/master/rpc#tendermint-rpc
-[lite]: https://github.com/informalsystems/tendermint-rs/tree/master/tendermint/src/lite
-[light-client-dir]: https://github.com/informalsystems/tendermint-rs/tree/master/light-client
+[tendermint-rpc]: https://github.com/informalsystems/tendermint-rs/tree/main/rpc#tendermint-rpc
+[lite]: https://github.com/informalsystems/tendermint-rs/tree/main/tendermint/src/lite
+[light-client-dir]: https://github.com/informalsystems/tendermint-rs/tree/main/light-client
 
 ## [0.13.0] (2020-04-20)
 
@@ -1133,7 +1133,7 @@ This release is compatible with [tendermint v0.28]
 - Initial release
 
 [0.10.0]: https://github.com/tendermint/kms/pull/328
-[tendermint v0.32]: https://github.com/tendermint/tendermint/blob/master/CHANGELOG.md#v0320
+[tendermint v0.32]: https://github.com/tendermint/tendermint/blob/main/CHANGELOG.md#v0320
 [#326]: https://github.com/tendermint/kms/pull/326
 [#324]: https://github.com/tendermint/kms/pull/324
 [#315]: https://github.com/tendermint/kms/pull/315
@@ -1156,15 +1156,15 @@ This release is compatible with [tendermint v0.28]
 [#235]: https://github.com/tendermint/kms/pull/235
 [#234]: https://github.com/tendermint/kms/pull/234
 [0.6.0]: https://github.com/tendermint/kms/pull/229
-[tendermint v0.31]: https://github.com/tendermint/tendermint/blob/master/CHANGELOG.md#v0310
+[tendermint v0.31]: https://github.com/tendermint/tendermint/blob/main/CHANGELOG.md#v0310
 [#228]: https://github.com/tendermint/kms/pull/228
 [0.5.0]: https://github.com/tendermint/kms/pull/220
-[tendermint v0.30]: https://github.com/tendermint/tendermint/blob/master/CHANGELOG.md#v0300
+[tendermint v0.30]: https://github.com/tendermint/tendermint/blob/main/CHANGELOG.md#v0300
 [#219]: https://github.com/tendermint/kms/pull/219
 [#205]: https://github.com/tendermint/kms/pull/219
 [#181]: https://github.com/tendermint/kms/pull/181
-[tendermint v0.29]: https://github.com/tendermint/tendermint/blob/master/CHANGELOG.md#v0290
-[tendermint v0.28]: https://github.com/tendermint/tendermint/blob/master/CHANGELOG.md#v0280
+[tendermint v0.29]: https://github.com/tendermint/tendermint/blob/main/CHANGELOG.md#v0290
+[tendermint v0.28]: https://github.com/tendermint/tendermint/blob/main/CHANGELOG.md#v0280
 [#30]: https://github.com/interchainio/tendermint-rs/pull/30
 [#16]: https://github.com/interchainio/tendermint-rs/pull/16
 [#15]: https://github.com/interchainio/tendermint-rs/pull/15
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 963d88f2c..240ebf7dc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -104,7 +104,7 @@ not fellow developers. Developers have much more context and care about more
 things than users do. Changelogs are for users.
 
 Changelog structure is modeled after [Tendermint
-Core](https://github.com/tendermint/tendermint/blob/master/CHANGELOG.md) and
+Core](https://github.com/tendermint/tendermint/blob/main/CHANGELOG.md) and
 [Hashicorp Consul](http://github.com/hashicorp/consul/tree/master/CHANGELOG.md).
 See those changelogs for examples.
 
@@ -195,8 +195,8 @@ Our release process is as follows:
 7. Once all crates have been successfully released, merge the PR to `master` and
    tag the repo at the new version (e.g. `v0.17.0`).
 
-[CHANGELOG.md]: https://github.com/informalsystems/tendermint-rs/blob/master/CHANGELOG.md
-[`release.sh`]: https://github.com/informalsystems/tendermint-rs/blob/master/release.sh
+[CHANGELOG.md]: https://github.com/informalsystems/tendermint-rs/blob/main/CHANGELOG.md
+[`release.sh`]: https://github.com/informalsystems/tendermint-rs/blob/main/release.sh
 [crates.io]: https://crates.io
 [unclog]: https://github.com/informalsystems/unclog
 [Tendermint]: https://tendermint.com
diff --git a/README.md b/README.md
index ccf209659..2533d40d0 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ Crates are released on [crates.io](https://crates.io).
 ## Contributing
 
 The Tendermint protocols are specified in English in the [tendermint/tendermint
-repo](https://github.com/tendermint/tendermint/tree/master/spec). Any protocol
+repo](https://github.com/tendermint/tendermint/tree/main/spec). Any protocol
 changes or clarifications should be contributed there.
 
 This repo contains the TLA+ specifications and Rust implementations for various
@@ -116,5 +116,5 @@ limitations under the License.
 [tendermint-rpc-docs-link]: https://docs.rs/tendermint-rpc/
 [Tendermint]: https://github.com/tendermint/tendermint
 [tendermint-light-client-docs-link]: https://docs.rs/tendermint-light-client/
-[tendermint-secret-conn]: https://docs.tendermint.com/master/spec/p2p/peer.html#authenticated-encryption-handshake
+[tendermint-secret-conn]: https://github.com/tendermint/tendermint/blob/v0.34.x/spec/p2p/peer.md#authenticated-encryption-handshake
 [contributing]: ./CONTRIBUTING.md
diff --git a/abci/README.md b/abci/README.md
index cf9bccd2c..48048990f 100644
--- a/abci/README.md
+++ b/abci/README.md
@@ -106,11 +106,11 @@ limitations under the License.
 [audit-image]: https://github.com/informalsystems/tendermint-rs/workflows/Audit-Check/badge.svg
 [audit-link]: https://github.com/informalsystems/tendermint-rs/actions?query=workflow%3AAudit-Check
 [license-image]: https://img.shields.io/badge/license-Apache2.0-blue.svg
-[license-link]: https://github.com/informalsystems/tendermint-rs/blob/master/LICENSE
+[license-link]: https://github.com/informalsystems/tendermint-rs/blob/main/LICENSE
 [rustc-image]: https://img.shields.io/badge/rustc-stable-blue.svg
 
 [//]: # (general links)
 
-[ABCI]: https://docs.tendermint.com/master/spec/abci/
+[ABCI]: https://github.com/tendermint/tendermint/tree/v0.34.x/spec/abci/
 [`Application`]: ./src/application.rs
 [tendermint-abci-spec]: https://github.com/tendermint/spec/blob/master/spec/abci/abci.md
diff --git a/abci/src/codec.rs b/abci/src/codec.rs
index d9932d30b..ce85acd24 100644
--- a/abci/src/codec.rs
+++ b/abci/src/codec.rs
@@ -2,7 +2,7 @@
 //!
 //! Implements the [Tendermint Socket Protocol][tsp].
 //!
-//! [tsp]: https://docs.tendermint.com/master/spec/abci/client-server.html#tsp
+//! [tsp]: https://github.com/tendermint/tendermint/blob/v0.34.x/spec/abci/client-server.md#tsp
 
 use std::{
     io::{Read, Write},
diff --git a/config/Cargo.toml b/config/Cargo.toml
index 5ad034eec..c64c5a6d4 100644
--- a/config/Cargo.toml
+++ b/config/Cargo.toml
@@ -4,7 +4,7 @@ version    = "0.23.9" # Also update `html_root_url` in lib.rs and
                                # depending crates (rpc, light-node, ..) when bumping this
 license    = "Apache-2.0"
 homepage   = "https://www.tendermint.com/"
-repository = "https://github.com/informalsystems/tendermint-rs/tree/master/tendermint"
+repository = "https://github.com/informalsystems/tendermint-rs/tree/main/tendermint"
 readme     = "../README.md"
 categories = ["cryptography", "cryptography::cryptocurrencies", "database"]
 keywords   = ["blockchain", "bft", "consensus", "cosmos", "tendermint"]
diff --git a/docs/architecture/adr-001-repo.md b/docs/architecture/adr-001-repo.md
index c41e1ec25..d50787d69 100644
--- a/docs/architecture/adr-001-repo.md
+++ b/docs/architecture/adr-001-repo.md
@@ -60,7 +60,7 @@ particulars of pubkey/signature/blockid/vote/etc. The lite client should be
 written generically, with its own traits, and the existing types made to
 implement them. 
 
-We should follow the [lite client spec closely](https://github.com/tendermint/tendermint/blob/master/docs/spec/consensus/light-client.md), and we should work in parallel on a TLA+ implementation.
+We should follow the [lite client spec closely](https://github.com/tendermint/tendermint/blob/main/docs/spec/consensus/light-client.md), and we should work in parallel on a TLA+ implementation.
 
 Note the spec assumes a function `signers(commit)`, which returns the validators
 for a given commit. In practice, the validator set itself is not in the commit,
diff --git a/docs/architecture/adr-002-light-client-adr-index.md b/docs/architecture/adr-002-light-client-adr-index.md
index cb43b8d65..cc145446a 100644
--- a/docs/architecture/adr-002-light-client-adr-index.md
+++ b/docs/architecture/adr-002-light-client-adr-index.md
@@ -66,5 +66,5 @@ specification][english-spec], is provided below:
 
 [english-spec]: https://github.com/tendermint/spec/tree/bucky/light-reorg/spec/consensus/light
 [tla-spec]: https://github.com/interchainio/verification/tree/igor/lite/spec/light-client
-[go-impl]: https://github.com/tendermint/tendermint/tree/master/lite2
+[go-impl]: https://github.com/tendermint/tendermint/tree/main/lite2
 [rust-impl]: https://github.com/interchainio/tendermint-rs/tree/master/tendermint-lite
diff --git a/docs/architecture/adr-003-light-client-core-verification.md b/docs/architecture/adr-003-light-client-core-verification.md
index 1e085a3ff..a5e219afd 100644
--- a/docs/architecture/adr-003-light-client-core-verification.md
+++ b/docs/architecture/adr-003-light-client-core-verification.md
@@ -154,8 +154,8 @@ set hash) from commits to the header itself (ie. the header hash), but that's
 left for the future.
 
 For more background on implementation of Tendermint commits and votes, see:
-- [ADR-025](https://github.com/tendermint/tendermint/blob/master/docs/architecture/adr-025-commit.md)
-- [Validator Signing Spec](https://github.com/tendermint/tendermint/blob/master/docs/spec/consensus/signing.md)
+- [ADR-025](https://github.com/tendermint/tendermint/blob/main/docs/architecture/adr-025-commit.md)
+- [Validator Signing Spec](https://github.com/tendermint/tendermint/blob/main/docs/spec/consensus/signing.md)
 - [Tendermint consensus specification](https://arxiv.org/abs/1807.04938)
 
 ### Validator Set
diff --git a/docs/architecture/adr-006-light-client-refactor.md b/docs/architecture/adr-006-light-client-refactor.md
index d196b7af0..792f4c3c9 100644
--- a/docs/architecture/adr-006-light-client-refactor.md
+++ b/docs/architecture/adr-006-light-client-refactor.md
@@ -20,7 +20,7 @@ outlines the runtime and concurrency concerns.
 The basis for this work comes from the learnings of the [Reactor
 Experiments](https://github.com/informalsystems/reactor-experiments) as
 well as the [Blockchain Reactor
-Refactor](https://github.com/tendermint/tendermint/blob/master/docs/architecture/adr-043-blockchain-riri-org.md). The key take aways from that work are:
+Refactor](https://github.com/tendermint/tendermint/blob/main/docs/architecture/adr-043-blockchain-riri-org.md). The key take aways from that work are:
 
 1. Separate concerns into independently verifiable (by humans as well as
    computers) components.
@@ -210,5 +210,5 @@ Implemented:
 ## References
 
 * [Light Client Spec](https://github.com/tendermint/spec/tree/bucky/light-reorg/spec/consensus/light)
-* [Blockchain Reactor Refactor](https://github.com/tendermint/tendermint/blob/master/docs/architecture/adr-043-blockchain-riri-org.md)
+* [Blockchain Reactor Refactor](https://github.com/tendermint/tendermint/blob/main/docs/architecture/adr-043-blockchain-riri-org.md)
 * [Reactor Experiments](https://github.com/informalsystems/reactor-experiments)
diff --git a/docs/architecture/adr-008-event-subscription.md b/docs/architecture/adr-008-event-subscription.md
index 14ad2b927..15dcfe5d3 100644
--- a/docs/architecture/adr-008-event-subscription.md
+++ b/docs/architecture/adr-008-event-subscription.md
@@ -314,7 +314,7 @@ impl Query {
     // ...
 }
 
-// Derived from https://github.com/tendermint/tendermint/blob/master/types/events.go
+// Derived from https://github.com/tendermint/tendermint/blob/main/types/events.go
 pub enum EventType {
     NewBlock,
     NewBlockHeader,
@@ -342,7 +342,7 @@ pub enum Condition {
     Exists(String),
 }
 
-// According to https://docs.tendermint.com/master/rpc/#/Websocket/subscribe,
+// According to https://docs.tendermint.com/v0.34/rpc/#/Websocket/subscribe,
 // an operand can be a string, number, date or time. We differentiate here
 // between integer and floating point numbers.
 //
@@ -463,7 +463,7 @@ None
 * [\#458][pr-458]
 * [Tendermint RPC subscription endpoint][tm-event-subs]
 
-[tm-event-subs]: https://docs.tendermint.com/master/rpc/#/Websocket/subscribe
+[tm-event-subs]: https://docs.tendermint.com/v0.34/rpc/#/Websocket/subscribe
 [client]: https://github.com/informalsystems/tendermint-rs/blob/06ed36eaf7a74c0357b86d1d7450a2fec52ed6a0/rpc/src/client.rs#L20
 [query-peg]: https://github.com/tendermint/tendermint/blob/98c595312af02037843b8fe74f0ee0625665448e/libs/pubsub/query/query.peg
 [tm-go-query]: https://github.com/tendermint/tendermint/blob/98c595312af02037843b8fe74f0ee0625665448e/libs/pubsub/pubsub.go#L64
diff --git a/docs/spec/fastsync/fastsync.md b/docs/spec/fastsync/fastsync.md
index 3643e6660..efd5dc801 100644
--- a/docs/spec/fastsync/fastsync.md
+++ b/docs/spec/fastsync/fastsync.md
@@ -406,7 +406,7 @@ Here we provide a specification of the FastSync V2 protocol as it is currently
 implemented. The V2 design is the result of significant refactoring to improve
 the testability and determinism in the implementation. The architecture is
 detailed in
-[ADR-43](https://github.com/tendermint/tendermint/blob/master/docs/architecture/adr-043-blockchain-riri-org.md).
+[ADR-43](https://github.com/tendermint/tendermint/blob/main/docs/architecture/adr-043-blockchain-riri-org.md).
 
 In the original design, a go-routine (thread of execution) was spawned for each block requested, and
 was responsible for both protocol logic and IO. In the V2 design, protocol logic
diff --git a/docs/spec/fastsync/fastsync.tla b/docs/spec/fastsync/fastsync.tla
index 2368001a7..9f2fb123a 100644
--- a/docs/spec/fastsync/fastsync.tla
+++ b/docs/spec/fastsync/fastsync.tla
@@ -6,7 +6,7 @@
 
  In this document we give the high level specification of the fast sync
  protocol as implemented here:
- https://github.com/tendermint/tendermint/tree/master/blockchain/v2.
+ https://github.com/tendermint/tendermint/tree/main/blockchain/v2.
 
 We assume a system in which one node is trying to sync with the blockchain
 (replicated state machine) by downloading blocks from the set of full nodes
diff --git a/docs/spec/fastsync/verification/fastsync_apalache.tla b/docs/spec/fastsync/verification/fastsync_apalache.tla
index 51dd54e57..3077b2d96 100644
--- a/docs/spec/fastsync/verification/fastsync_apalache.tla
+++ b/docs/spec/fastsync/verification/fastsync_apalache.tla
@@ -2,7 +2,7 @@
 (*
  In this document we give the high level specification of the fast sync
  protocol as implemented here:
- https://github.com/tendermint/tendermint/tree/master/blockchain/v2.
+ https://github.com/tendermint/tendermint/tree/main/blockchain/v2.
 
 We assume a system in which one node is trying to sync with the blockchain
 (replicated state machine) by downloading blocks from the set of full nodes
diff --git a/docs/spec/lightclient/README.md b/docs/spec/lightclient/README.md
index eee1bb4ce..779de85fb 100644
--- a/docs/spec/lightclient/README.md
+++ b/docs/spec/lightclient/README.md
@@ -11,8 +11,8 @@ for the most recent version.
 
 This directory contains work-in-progress English and TLA+ specifications for the Light Client
 protocol. Implementations of the light client can be found in
-[Rust](https://github.com/informalsystems/tendermint-rs/tree/master/light-client) and
-[Go](https://github.com/tendermint/tendermint/tree/master/light).
+[Rust](https://github.com/informalsystems/tendermint-rs/tree/main/light-client) and
+[Go](https://github.com/tendermint/tendermint/tree/main/light).
 
 Light clients are assumed to be initialized once from a trusted source 
 with a trusted header and validator set. The light client
@@ -29,8 +29,8 @@ The light client is decomposed into three components:
 
 The [English specification](verification/verification.md) describes the light client
 commit verification problem in terms of the temporal properties
-[LCV-DIST-SAFE.1](https://github.com/informalsystems/tendermint-rs/blob/master/docs/spec/lightclient/verification/verification.md#lcv-dist-safe1) and 
-[LCV-DIST-LIVE.1](https://github.com/informalsystems/tendermint-rs/blob/master/docs/spec/lightclient/verification/verification.md#lcv-dist-live1). 
+[LCV-DIST-SAFE.1](https://github.com/informalsystems/tendermint-rs/blob/main/docs/spec/lightclient/verification/verification.md#lcv-dist-safe1) and 
+[LCV-DIST-LIVE.1](https://github.com/informalsystems/tendermint-rs/blob/main/docs/spec/lightclient/verification/verification.md#lcv-dist-live1). 
 Commit verification is assumed to operate within the Tendermint Failure Model, where +2/3 of validators are correct for some time period and
 validator sets can change arbitrarily at each height.
 
diff --git a/docs/spec/lightclient/attacks/evidence-handling.md b/docs/spec/lightclient/attacks/evidence-handling.md
index 83d15d544..688177b31 100644
--- a/docs/spec/lightclient/attacks/evidence-handling.md
+++ b/docs/spec/lightclient/attacks/evidence-handling.md
@@ -25,7 +25,7 @@ detects an attack, it needs to send to a witness only missing data (common heigh
 and conflicting light block) as it has its trace. Keeping light client attack data of constant size 
 saves bandwidth and reduces an attack surface. As we will explain below, although in the context of 
 light client core 
-[verification](https://github.com/informalsystems/tendermint-rs/tree/master/docs/spec/lightclient/verification) 
+[verification](https://github.com/informalsystems/tendermint-rs/tree/main/docs/spec/lightclient/verification) 
 the roles of primary and witness are clearly defined, 
 in case of the attack, we run the same attack detection procedure twice where the roles are swapped. 
 The rationale is that the light client does not know what peer is correct (on a right main branch) 
@@ -76,7 +76,7 @@ The following invariant holds for the primary trace:
 ### Witness with a conflicting header
 
 The verified header at height `h` is cross-checked with every witness as part of 
-[detection](https://github.com/informalsystems/tendermint-rs/tree/master/docs/spec/lightclient/detection). 
+[detection](https://github.com/informalsystems/tendermint-rs/tree/main/docs/spec/lightclient/detection). 
 If a witness returns the conflicting header at the height `h` the following procedure is executed to verify 
 if the conflicting header comes from the valid trace and if that's the case to create an attack evidence:
 
diff --git a/docs/spec/lightclient/detection/detection.md b/docs/spec/lightclient/detection/detection.md
index 9edc8f7e6..7149c886a 100644
--- a/docs/spec/lightclient/detection/detection.md
+++ b/docs/spec/lightclient/detection/detection.md
@@ -723,7 +723,7 @@ func ForkDetector(ls LightStore, PoFs PoFStore)
 
 [verificationVDD]: https://github.com/informalsystems/VDD/blob/master/lightclient/failuredetector.md
 
-[verification]: https://github.com/informalsystems/tendermint-rs/blob/master/docs/spec/lightclient/verification.md
+[verification]: https://github.com/informalsystems/tendermint-rs/blob/main/docs/spec/lightclient/verification.md
 
 [accountability]: https://github.com/tendermint/spec/blob/master/spec/consensus/light-client/accountability.md
 
diff --git a/docs/spec/lightclient/verification/Lightclient_A_1.tla b/docs/spec/lightclient/verification/Lightclient_A_1.tla
index 74e54c557..64d3fc6a5 100644
--- a/docs/spec/lightclient/verification/Lightclient_A_1.tla
+++ b/docs/spec/lightclient/verification/Lightclient_A_1.tla
@@ -6,7 +6,7 @@
 
  * A state-machine specification of the lite client, following the English spec:
  *
- * https://github.com/informalsystems/tendermint-rs/blob/master/docs/spec/lightclient/verification.md
+ * https://github.com/informalsystems/tendermint-rs/blob/main/docs/spec/lightclient/verification.md
  *) 
 
 EXTENDS Integers, FiniteSets
diff --git a/docs/spec/lightclient/verification/verification.md b/docs/spec/lightclient/verification/verification.md
index 8ac9d9d0c..4bd4b746a 100644
--- a/docs/spec/lightclient/verification/verification.md
+++ b/docs/spec/lightclient/verification/verification.md
@@ -1180,7 +1180,7 @@ func Main (primary PeerID, lightStore LightStore, targetHeight Height)
 
 [[lightclient]] The light client ADR [77d2651 on Dec 27, 2019].
 
-[RPC]: https://docs.tendermint.com/master/rpc/
+[RPC]: https://docs.tendermint.com/v0.34/rpc/
 
 [block]: https://github.com/tendermint/spec/blob/d46cd7f573a2c6a2399fcab2cde981330aa63f37/spec/core/data_structures.md
 
@@ -1195,7 +1195,7 @@ func Main (primary PeerID, lightStore LightStore, targetHeight Height)
 [TMBC-SOUND-DISTR-POSS-COMMIT-link]: #tmbc-sound-distr-poss-commit1
 
 [lightclient]: https://github.com/interchainio/tendermint-rs/blob/e2cb9aca0b95430fca2eac154edddc9588038982/docs/architecture/adr-002-lite-client.md
-[fork-detector]: https://github.com/informalsystems/tendermint-rs/blob/master/docs/spec/lightclient/detection.md
+[fork-detector]: https://github.com/informalsystems/tendermint-rs/blob/main/docs/spec/lightclient/detection.md
 [fullnode]: https://github.com/tendermint/spec/blob/master/spec/blockchain/fullnode.md
 
 [ibc-rs]:https://github.com/informalsystems/ibc-rs
diff --git a/light-client-js/examples/verifier-web/index.html b/light-client-js/examples/verifier-web/index.html
index 88d5cdce5..1ae9784e3 100644
--- a/light-client-js/examples/verifier-web/index.html
+++ b/light-client-js/examples/verifier-web/index.html
@@ -20,7 +20,7 @@
     <h1 class="title is-2">Tendermint Light Client WASM Example</h1>
     <p>
       This example demonstrates how to make use of the
-      <a href="https://github.com/informalsystems/tendermint-rs/tree/master/light-client">Tendermint Light Client</a>
+      <a href="https://github.com/informalsystems/tendermint-rs/tree/main/light-client">Tendermint Light Client</a>
       WASM build in a simple web application.
     </p>
   </div>
diff --git a/light-client-js/src/lib.rs b/light-client-js/src/lib.rs
index 16cb9896d..2c67e5e65 100644
--- a/light-client-js/src/lib.rs
+++ b/light-client-js/src/lib.rs
@@ -6,8 +6,8 @@
 //! For a detailed example, please see the [`verifier-web` example] in the
 //! repository.
 //!
-//! [`tendermint-light-client-verifier`]: https://github.com/informalsystems/tendermint-rs/tree/master/light-client-verifier
-//! [`verifier-web` example]: https://github.com/informalsystems/tendermint-rs/tree/master/light-client-js/examples/verifier-web
+//! [`tendermint-light-client-verifier`]: https://github.com/informalsystems/tendermint-rs/tree/main/light-client-verifier
+//! [`verifier-web` example]: https://github.com/informalsystems/tendermint-rs/tree/main/light-client-js/examples/verifier-web
 
 mod utils;
 
diff --git a/light-client-verifier/README.md b/light-client-verifier/README.md
index 7abf72a52..ff593cdf4 100644
--- a/light-client-verifier/README.md
+++ b/light-client-verifier/README.md
@@ -23,6 +23,6 @@ See documentation on [crates.io][docs-link].
 [//]: # (general links)
 
 [repo root]: https://github.com/informalsystems/tendermint-rs
-[quick start]: https://github.com/tendermint/tendermint/blob/master/docs/introduction/quick-start.md
+[quick start]: https://github.com/tendermint/tendermint/blob/main/docs/introduction/quick-start.md
 [Tendermint]: https://github.com/tendermint/tendermint
-[Light Client]: https://github.com/informalsystems/tendermint-rs/tree/master/light-client
+[Light Client]: https://github.com/informalsystems/tendermint-rs/tree/main/light-client
diff --git a/light-client-verifier/src/options.rs b/light-client-verifier/src/options.rs
index e1582af54..01fb95fca 100644
--- a/light-client-verifier/src/options.rs
+++ b/light-client-verifier/src/options.rs
@@ -1,6 +1,6 @@
 //! Light client implementation as per the [Core Verification specification][1].
 //!
-//! [1]: https://github.com/informalsystems/tendermint-rs/blob/master/docs/spec/lightclient/verification/verification.md
+//! [1]: https://github.com/informalsystems/tendermint-rs/blob/main/docs/spec/lightclient/verification/verification.md
 
 use core::time::Duration;
 
diff --git a/light-client/README.md b/light-client/README.md
index d3d92264b..db98c850d 100644
--- a/light-client/README.md
+++ b/light-client/README.md
@@ -16,7 +16,7 @@ See documentation on [crates.io][docs-link].
 
 The code below demonstrates the main use case for the Tendermint Light Client: syncing to the latest block, verifying it, and performing fork detection.
 
-Please refer to the [`light_client` example](https://github.com/informalsystems/tendermint-rs/blob/master/light-client/examples/light_client.rs) for fully working code.
+Please refer to the [`light_client` example](https://github.com/informalsystems/tendermint-rs/blob/main/light-client/examples/light_client.rs) for fully working code.
 
 ```rust
 let primary_instance: Instance = make_instance(primary, primary_addr, primary_path);
@@ -179,7 +179,7 @@ $ cargo test -p tendermint-light-client --all-features
 [//]: # (general links)
 
 [repo root]: https://github.com/informalsystems/tendermint-rs
-[quick start]: https://github.com/tendermint/tendermint/blob/master/docs/introduction/quick-start.md
+[quick start]: https://github.com/tendermint/tendermint/blob/main/docs/introduction/quick-start.md
 [Tendermint]: https://github.com/tendermint/tendermint
-[light-client-verification]: https://github.com/informalsystems/tendermint-rs/blob/master/docs/spec/lightclient/verification/verification.md
-[light-client-detection]: https://github.com/informalsystems/tendermint-rs/tree/master/docs/spec/lightclient/detection
+[light-client-verification]: https://github.com/informalsystems/tendermint-rs/blob/main/docs/spec/lightclient/verification/verification.md
+[light-client-detection]: https://github.com/informalsystems/tendermint-rs/tree/main/docs/spec/lightclient/detection
diff --git a/light-client/src/light_client.rs b/light-client/src/light_client.rs
index ce8f086b6..3ebb58498 100644
--- a/light-client/src/light_client.rs
+++ b/light-client/src/light_client.rs
@@ -1,6 +1,6 @@
 //! Light client implementation as per the [Core Verification specification][1].
 //!
-//! [1]: https://github.com/informalsystems/tendermint-rs/blob/master/docs/spec/lightclient/verification/verification.md
+//! [1]: https://github.com/informalsystems/tendermint-rs/blob/main/docs/spec/lightclient/verification/verification.md
 
 use core::fmt;
 
diff --git a/light-client/tests/support/model_based/README.md b/light-client/tests/support/model_based/README.md
index 5f1cf73d5..fafd9fcd2 100644
--- a/light-client/tests/support/model_based/README.md
+++ b/light-client/tests/support/model_based/README.md
@@ -19,7 +19,7 @@ When you run `cargo test` some machinery will run under the hood, namely:
   For that translation two other components are necessary:
   * [Jsonatr (JSON Arrifact Translator)](https://github.com/informalsystems/jsonatr) 
     performs the translation by executing this [transformation spec](_jsonatr-lib/apalache_to_lite_test.json);
-  * [Tendermint Testgen](https://github.com/informalsystems/tendermint-rs/tree/master/testgen)
+  * [Tendermint Testgen](https://github.com/informalsystems/tendermint-rs/tree/main/testgen)
   takes care of translating abstract values from the model into the concrete implementation values.
 * `timeout` command is used to limit the test execution time.
 
diff --git a/proto/Cargo.toml b/proto/Cargo.toml
index a04e4a64b..1b5c5a6c3 100644
--- a/proto/Cargo.toml
+++ b/proto/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.23.9"
 authors = ["Informal Systems <hello@informal.systems>"]
 edition = "2018"
 license = "Apache-2.0"
-repository = "https://github.com/informalsystems/tendermint-rs/tree/master/proto"
+repository = "https://github.com/informalsystems/tendermint-rs/tree/main/proto"
 readme     = "README.md"
 categories = ["cryptography", "cryptography::cryptocurrencies", "database"]
 keywords   = ["blockchain", "tendermint", "proto"]
diff --git a/proto/README.md b/proto/README.md
index cafcdaa76..c80e18835 100644
--- a/proto/README.md
+++ b/proto/README.md
@@ -42,9 +42,9 @@ limitations under the License.
 [audit-image]: https://github.com/informalsystems/tendermint-rs/workflows/Audit-Check/badge.svg
 [audit-link]: https://github.com/informalsystems/tendermint-rs/actions?query=workflow%3AAudit-Check
 [license-image]: https://img.shields.io/badge/license-Apache2.0-blue.svg
-[license-link]: https://github.com/informalsystems/tendermint-rs/blob/master/LICENSE
+[license-link]: https://github.com/informalsystems/tendermint-rs/blob/main/LICENSE
 [rustc-image]: https://img.shields.io/badge/rustc-stable-blue.svg
 
 [//]: # (general links)
 
-[tendermint-go-proto-link]: https://github.com/tendermint/tendermint/tree/master/proto/tendermint
+[tendermint-go-proto-link]: https://github.com/tendermint/tendermint/tree/main/proto/tendermint
diff --git a/rpc/README.md b/rpc/README.md
index 50ba0584b..b45404881 100644
--- a/rpc/README.md
+++ b/rpc/README.md
@@ -100,7 +100,7 @@ traits.
 - RPC [core types] in golang
   
 - RPC endpoints REST interface documentation:
-https://docs.tendermint.com/master/rpc/ 
+  <https://docs.tendermint.com/v0.34/rpc/>
 
 ## Testing
 
@@ -151,6 +151,6 @@ cargo test --all-features -- --ignored
 [tendermint]: https://github.com/tendermint/tendermint
 [core types]: https://github.com/tendermint/tendermint/blob/8b4a30fada85fccd8f0cb15009344f1cbd8de616/rpc/core/types/responses.go#L1
 [tendermint.rs]: https://crates.io/crates/tendermint
-[Tendermint RPC]: https://docs.tendermint.com/master/rpc/
-[`/subscribe` endpoint]: https://docs.tendermint.com/master/rpc/#/Websocket/subscribe
+[Tendermint RPC]: https://docs.tendermint.com/v0.34/rpc/
+[`/subscribe` endpoint]: https://docs.tendermint.com/v0.34/rpc/#/Websocket/subscribe
 [autogen-fixtures]: https://github.com/informalsystems/tendermint-rs/issues/612
diff --git a/rpc/src/endpoint/validators.rs b/rpc/src/endpoint/validators.rs
index 51b9a1fc3..3c8559c83 100644
--- a/rpc/src/endpoint/validators.rs
+++ b/rpc/src/endpoint/validators.rs
@@ -29,7 +29,7 @@ impl Request {
     /// See the [Tendermint RPC] for the defaults for each option when set to
     /// `None`.
     ///
-    /// [Tendermint RPC]: https://docs.tendermint.com/master/rpc/#/Info/validators
+    /// [Tendermint RPC]: https://docs.tendermint.com/v0.34/rpc/#/Info/validators
     pub fn new(
         height: Option<block::Height>,
         page: Option<PageNumber>,
diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs
index e5822ce0c..bd9e0eb82 100644
--- a/rpc/src/lib.rs
+++ b/rpc/src/lib.rs
@@ -22,8 +22,8 @@
 //! [`MockClient`], which implements both [`Client`] and [`SubscriptionClient`]
 //! traits.
 //!
-//! [Tendermint RPC]: https://docs.tendermint.com/master/rpc/
-//! [`/subscribe` endpoint]: https://docs.tendermint.com/master/rpc/#/Websocket/subscribe
+//! [Tendermint RPC]: https://docs.tendermint.com/v0.34/rpc/
+//! [`/subscribe` endpoint]: https://docs.tendermint.com/v0.34/rpc/#/Websocket/subscribe
 
 #![no_std]
 
diff --git a/rpc/src/query.rs b/rpc/src/query.rs
index 50eee895d..1576c0702 100644
--- a/rpc/src/query.rs
+++ b/rpc/src/query.rs
@@ -54,7 +54,7 @@ use crate::{prelude::*, Error};
 /// assert_eq!(query, Query::from(EventType::Tx).and_gte("tx.height", 100_u64));
 /// ```
 ///
-/// [subscribe endpoint documentation]: https://docs.tendermint.com/master/rpc/#/Websocket/subscribe
+/// [subscribe endpoint documentation]: https://docs.tendermint.com/v0.34/rpc/#/Websocket/subscribe
 #[derive(Debug, Clone, PartialEq)]
 pub struct Query {
     // We can only have at most one event type at present in a query.
@@ -463,7 +463,7 @@ impl fmt::Display for Condition {
 /// between integer and floating point numbers.
 ///
 /// [`Condition`]: enum.Condition.html
-/// [tm-subscribe]: https://docs.tendermint.com/master/rpc/#/Websocket/subscribe
+/// [tm-subscribe]: https://docs.tendermint.com/v0.34/rpc/#/Websocket/subscribe
 #[derive(Debug, Clone, PartialEq)]
 pub enum Operand {
     String(String),
diff --git a/rpc/src/response_error.rs b/rpc/src/response_error.rs
index b5441c17c..d74d116ae 100644
--- a/rpc/src/response_error.rs
+++ b/rpc/src/response_error.rs
@@ -19,7 +19,7 @@ pub struct ResponseError {
 // /// Tendermint RPC error codes.
 // ///
 /// See `func RPC*Error()` definitions in:
-/// <https://github.com/tendermint/tendermint/blob/master/rpc/jsonrpc/types/types.go>
+/// <https://github.com/tendermint/tendermint/blob/main/rpc/jsonrpc/types/types.go>
 #[derive(Copy, Clone, Debug, Eq, thiserror::Error, Hash, PartialEq, PartialOrd, Ord)]
 pub enum Code {
     /// Low-level HTTP error
@@ -35,7 +35,7 @@ pub enum Code {
     /// This is an error unique to this client, and is not available in the
     /// [Go client].
     ///
-    /// [Go client]: https://github.com/tendermint/tendermint/tree/master/rpc/jsonrpc/client
+    /// [Go client]: https://github.com/tendermint/tendermint/tree/main/rpc/jsonrpc/client
     #[error("Client internal error")]
     ClientInternalError,
 
diff --git a/tendermint/Cargo.toml b/tendermint/Cargo.toml
index b4910d3f9..f80d6085e 100644
--- a/tendermint/Cargo.toml
+++ b/tendermint/Cargo.toml
@@ -4,7 +4,7 @@ version    = "0.23.9" # Also update `html_root_url` in lib.rs and
                                # depending crates (rpc, light-node, ..) when bumping this
 license    = "Apache-2.0"
 homepage   = "https://www.tendermint.com/"
-repository = "https://github.com/informalsystems/tendermint-rs/tree/master/tendermint"
+repository = "https://github.com/informalsystems/tendermint-rs/tree/main/tendermint"
 readme     = "../README.md"
 categories = ["cryptography", "cryptography::cryptocurrencies", "database"]
 keywords   = ["blockchain", "bft", "consensus", "cosmos", "tendermint"]
diff --git a/tendermint/src/abci/responses.rs b/tendermint/src/abci/responses.rs
index c0f64fccc..cca348473 100644
--- a/tendermint/src/abci/responses.rs
+++ b/tendermint/src/abci/responses.rs
@@ -44,7 +44,7 @@ where
 ///
 /// This type corresponds to the `ResponseDeliverTx` proto from:
 ///
-/// <https://github.com/tendermint/tendermint/blob/master/abci/types/types.proto>
+/// <https://github.com/tendermint/tendermint/blob/main/abci/types/types.proto>
 // TODO(tarcieri): generate this automatically from the proto
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct DeliverTx {
diff --git a/testgen/Cargo.toml b/testgen/Cargo.toml
index 2196abe46..ba69965b4 100644
--- a/testgen/Cargo.toml
+++ b/testgen/Cargo.toml
@@ -6,7 +6,7 @@ edition     = "2018"
 readme      = "README.md"
 license     = "Apache-2.0"
 homepage    = "https://www.tendermint.com/"
-repository  = "https://github.com/informalsystems/tendermint-rs/tree/master/testgen"
+repository  = "https://github.com/informalsystems/tendermint-rs/tree/main/testgen"
 keywords    = ["blockchain", "tendermint", "testing"]
 categories  = ["cryptography::cryptocurrencies", "development-tools"]
 description = """
diff --git a/testgen/README.md b/testgen/README.md
index a2804b00a..5e6a8cde9 100644
--- a/testgen/README.md
+++ b/testgen/README.md
@@ -85,7 +85,7 @@ limitations under the License.
 [build-image]: https://github.com/informalsystems/tendermint-rs/workflows/Rust/badge.svg
 [build-link]: https://github.com/informalsystems/tendermint-rs/actions?query=workflow%3ARust
 [license-image]: https://img.shields.io/badge/license-Apache2.0-blue.svg
-[license-link]: https://github.com/informalsystems/tendermint-rs/blob/master/LICENSE
+[license-link]: https://github.com/informalsystems/tendermint-rs/blob/main/LICENSE
 [rustc-image]: https://img.shields.io/badge/rustc-stable-blue.svg
 
 [//]: # (general links)
diff --git a/testgen/src/lib.rs b/testgen/src/lib.rs
index 0e59e7c86..25b237b52 100644
--- a/testgen/src/lib.rs
+++ b/testgen/src/lib.rs
@@ -3,7 +3,7 @@
 //!
 //! See the [repository] for details.
 //!
-//! [repository]: https://github.com/informalsystems/tendermint-rs/tree/master/testgen
+//! [repository]: https://github.com/informalsystems/tendermint-rs/tree/main/testgen
 
 #[macro_use]
 pub mod helpers;
diff --git a/tools/rpc-probe/README.md b/tools/rpc-probe/README.md
index c7687d7b1..2cd62b654 100644
--- a/tools/rpc-probe/README.md
+++ b/tools/rpc-probe/README.md
@@ -92,5 +92,5 @@ For example, the `rpc/tests/incoming/abci_info.json` file (returned by the
 The full JSON-RPC wrapper is saved to disk.
 
 [Tendermint]: https://github.com/tendermint/tendermint
-[Tendermint RPC]: https://docs.tendermint.com/master/rpc/
-[`abci_info`]: https://docs.tendermint.com/master/rpc/#/ABCI/abci_info
+[Tendermint RPC]: https://docs.tendermint.com/v0.34/rpc/
+[`abci_info`]: https://docs.tendermint.com/v0.34/rpc/#/ABCI/abci_info