diff --git a/ChangeLog b/ChangeLog
index 573951797..582867eb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -77,6 +77,8 @@ Bugfix
      on some toolchains. Reported by phoenixmcallister. Fixes #2170.
    * Fix double initialization of ECC hardware that made some accelerators
      hang.
+   * Clarify documentation of mbedtls_ssl_set_own_cert() regarding the absence
+     of check for certificate/key matching. Reported by Attila Molnar, #507.
 
 = mbed TLS 2.14.0 branch released 2018-11-19
 
diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h
index 55b206fae..8106bb4ab 100644
--- a/include/mbedtls/ssl.h
+++ b/include/mbedtls/ssl.h
@@ -2044,6 +2044,14 @@ void mbedtls_ssl_conf_ca_chain( mbedtls_ssl_config *conf,
  *                 whether it matches those preferences - the server can then
  *                 decide what it wants to do with it.
  *
+ * \note           The provided \p pk_key needs to match the public key in the
+ *                 first certificate in \p own_cert, or all handshakes using
+ *                 that certificate will fail. It is your responsibility
+ *                 to ensure that; this function will not perform any check.
+ *                 You may use mbedtls_pk_check_pair() in order to perform
+ *                 this check yourself, but be aware that this function can
+ *                 be computationally expensive on some key types.
+ *
  * \param conf     SSL configuration
  * \param own_cert own public certificate chain
  * \param pk_key   own private key