diff --git a/include/mbedtls/pkcs5.h b/include/mbedtls/pkcs5.h
index b5c544604..d054d6759 100644
--- a/include/mbedtls/pkcs5.h
+++ b/include/mbedtls/pkcs5.h
@@ -116,8 +116,7 @@ int mbedtls_pkcs5_pbes2(const mbedtls_asn1_buf *pbe_params, int mode,
  * \param data       data to process
  * \param datalen    length of data
  * \param output     Output buffer.
- *                   On success, it contains the decrypted data, possibly
- *                   followed by the CBC padding.
+ *                   On success, it contains the decrypted data.
  *                   On failure, the content is indetermidate.
  *                   For decryption, there must be enough room for \p datalen
  *                   bytes.
@@ -127,7 +126,7 @@ int mbedtls_pkcs5_pbes2(const mbedtls_asn1_buf *pbe_params, int mode,
  * \param output_size size of output buffer.
  *                    This must be big enough to accommodate for output plus
  *                    padding data.
- * \param output_len length of actual data written to the output buffer.
+ * \param output_len On success, length of actual data written to the output buffer.
  *
  * \returns        0 on success, or a MBEDTLS_ERR_XXX code if verification fails.
  */