diff --git a/ChangeLog.d/mbedtls_ssl_set_cid-documentation.txt b/ChangeLog.d/mbedtls_ssl_set_cid-documentation.txt
new file mode 100644
index 0000000000..1ad970fdfb
--- /dev/null
+++ b/ChangeLog.d/mbedtls_ssl_set_cid-documentation.txt
@@ -0,0 +1,3 @@
+Bugfix
+   * Fixed documentation of mbedtls_ssl_set_cid(): the set CID configuration
+     is applied to all subsequent handshakes, not just to the next one.