diff --git a/include/mbedtls/lms.h b/include/mbedtls/lms.h
index 15a1a1b28..850bb6a00 100644
--- a/include/mbedtls/lms.h
+++ b/include/mbedtls/lms.h
@@ -347,7 +347,8 @@ void mbedtls_lms_private_free( mbedtls_lms_private_t *ctx );
  *
  * \warning                  This function is **not intended for use in
  *                           production**, due to as-yet unsolved problems with
- *                           handling stateful keys.
+ *                           handling stateful keys. The API for this function
+ *                           may change considerably in future versions.
  *
  * \note                     The seed must have at least 256 bits of entropy.
  *
@@ -398,7 +399,8 @@ int mbedtls_lms_calculate_public_key( mbedtls_lms_public_t *ctx,
  *
  * \warning                  This function is **not intended for use in
  *                           production**, due to as-yet unsolved problems with
- *                           handling stateful keys.
+ *                           handling stateful keys. The API for this function
+ *                           may change considerably in future versions.
  *
  * \note                     Before this function is called, the context must
  *                           have been initialized and must contain a private
diff --git a/library/lmots.h b/library/lmots.h
index 2c6571480..39e869925 100644
--- a/library/lmots.h
+++ b/library/lmots.h
@@ -190,7 +190,8 @@ int mbedtls_lmots_calculate_public_key_candidate( const mbedtls_lmots_parameters
  *
  * \warning                  This function is **not intended for use in
  *                           production**, due to as-yet unsolved problems with
- *                           handling stateful keys.
+ *                           handling stateful keys. The API for this function
+ *                           may change considerably in future versions.
  *
  * \note                     Before this function is called, the context must
  *                           have been initialized and must contain a public key
@@ -237,7 +238,8 @@ void mbedtls_lmots_private_free( mbedtls_lmots_private_t *ctx );
  *
  * \warning                  This function is **not intended for use in
  *                           production**, due to as-yet unsolved problems with
- *                           handling stateful keys.
+ *                           handling stateful keys. The API for this function
+ *                           may change considerably in future versions.
  *
  * \note                     The seed must have at least 256 bits of entropy.
  *