diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57a8671e..8b1f68d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.6.0] - 2021-05-24
+
 ### Added
 
 - Cancel command for the ASB that allows cancelling a specific swap by id.
@@ -117,6 +119,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed an issue where Alice would not verify if Bob's Bitcoin lock transaction is semantically correct, i.e. pays the agreed upon amount to an output owned by both of them.
   Fixing this required a **breaking change** on the network layer and hence old versions are not compatible with this version.
 
-[Unreleased]: https://github.com/comit-network/xmr-btc-swap/compare/0.5.0...HEAD
+[Unreleased]: https://github.com/comit-network/xmr-btc-swap/compare/0.6.0...HEAD
+[0.6.0]: https://github.com/comit-network/xmr-btc-swap/compare/0.5.0...0.6.0
 [0.5.0]: https://github.com/comit-network/xmr-btc-swap/compare/0.4.0...0.5.0
 [0.4.0]: https://github.com/comit-network/xmr-btc-swap/compare/v0.3...0.4.0
diff --git a/Cargo.lock b/Cargo.lock
index f18f0e93..c69a4e49 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3843,7 +3843,7 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2"
 
 [[package]]
 name = "swap"
-version = "0.5.0"
+version = "0.6.0"
 dependencies = [
  "anyhow",
  "async-compression",
diff --git a/docs/asb/README.md b/docs/asb/README.md
index b0e314c1..396ee195 100644
--- a/docs/asb/README.md
+++ b/docs/asb/README.md
@@ -21,11 +21,12 @@ Run `./asb --help` for more information.
 
 ### Running on mainnet
 
-Public Monero mainnet nodes can be found [here](https://moneroworld.com/#nodes).
-The default mainnet node is set to `node.moneroworld.com:18089`.
-
 For running the ASB on mainnet you will have to change you `monero-wallet-rpc` setup to mainnet.
-The default port for expecting the `monero-wallet-rpc` when running the ASB on mainnet is `18083`.
+
+It is recommended that you run your own Monero and Bitcoin node when running on mainnet.
+It is possible to plug into public blockchain nodes but be aware that you might lose some privacy doing so.
+Public Monero mainnet nodes can be found [here](https://moneroworld.com/#nodes).
+Public Electrum mainnet nodes can be found [here](https://1209k.com/bitcoin-eye/ele.php?chain=btc).
 
 ## ASB Details
 
diff --git a/swap/Cargo.toml b/swap/Cargo.toml
index fa77b290..60d91106 100644
--- a/swap/Cargo.toml
+++ b/swap/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "swap"
-version = "0.5.0"
+version = "0.6.0"
 authors = [ "The COMIT guys <hello@comit.network>" ]
 edition = "2018"
 description = "XMR/BTC trustless atomic swaps."
diff --git a/swap/src/cli/command.rs b/swap/src/cli/command.rs
index d3ec4313..1da75a2e 100644
--- a/swap/src/cli/command.rs
+++ b/swap/src/cli/command.rs
@@ -12,7 +12,7 @@ use url::Url;
 use uuid::Uuid;
 
 // See: https://moneroworld.com/
-pub const DEFAULT_MONERO_DAEMON_ADDRESS: &str = "node.moneroworld.com:18089";
+pub const DEFAULT_MONERO_DAEMON_ADDRESS: &str = "node.xmr.to:18081";
 pub const DEFAULT_MONERO_DAEMON_ADDRESS_STAGENET: &str = "monero-stagenet.exan.tech:38081";
 
 // See: https://1209k.com/bitcoin-eye/ele.php?chain=btc