diff --git a/docs/tools/leshan-broker.md b/docs/tools/leshan-broker.md
index 3ada3ec..202e972 100644
--- a/docs/tools/leshan-broker.md
+++ b/docs/tools/leshan-broker.md
@@ -13,6 +13,13 @@ The IETF has created the Constrained Application Protocol (CoAP) which has a cli
LwM2M architecture (Source)
+## Connect to the IoT-LAB Leshan broker
+
+**Important things:**
+
+* Leshan broker is accessible only via IPv6 at **leshan6.iot-lab.info** on port 5683
+* Leshan dashboard is accessible only via IPv4 at **[leshan4.iot-lab.info](http://leshan4.iot-lab.info/)** on port 80
+
### Register a LwM2M client
@@ -23,15 +30,15 @@ ssh @.iot-lab.info
@:~$ git clone https://github.com/eclipse/wakaama.git
@:~$ cmake wakaama/examples/client
@:~$ make
-@:~$ ./lwm2mclient -h leshan.iot-lab.info
+@:~$ ./lwm2mclient -h leshan6.iot-lab.info
Trying to bind LWM2M Client to port 56830
LWM2M Client "testlwm2mclient" started on port 56830
-> Opening connection to server at leshan.iot-lab.info:5683
+> Opening connection to server at leshan6.iot-lab.info:5683
-> State: STATE_REGISTERING
-22 bytes received from [2001:660:5307:3200::2]:5683
-64 41 B4 18 18 B4 50 39 82 72 64 0A 32 4E 75 48 dA....P9.rd.2NuH
-39 59 79 71 47 61 9YyqGa
+22 bytes received from [2a07:2e40:fffe:10::2]:5683
+64 41 7B 48 48 7B 21 42 82 72 64 0A 56 4E 73 79 dA{HH{!B.rd.VNsy
+64 4B 6C 47 59 71 dKlGYq
-> State: STATE_READY
```
-You can check the registration directly on the [web interface](http://leshan.iot-lab.info) of the Leshan server.
\ No newline at end of file
+You can check the registration directly on the [web interface](http://leshan4.iot-lab.info/) of the Leshan server.
\ No newline at end of file
diff --git a/docs/tools/mqtt-broker.md b/docs/tools/mqtt-broker.md
index 65de8f4..3afdeba 100644
--- a/docs/tools/mqtt-broker.md
+++ b/docs/tools/mqtt-broker.md
@@ -32,7 +32,7 @@ at **mqtt.iot-lab.info**. This instance is public and only
**Important things:**
-> Any FIT IoT-LAB user can connect to mqtt.iot-lab.info with its personal
+> Any FIT IoT-LAB user can connect to mqtt4.iot-lab.info with its personal
> FIT IoT-LAB credentials and a certificate file that is available either here
> or on each SSH frontend in /opt/iot-lab-ca.pem.
> Authenticated FIT IoT-LAB users can only have access to `iotlab/`