diff --git a/libwvdrmengine/oemcrypto/CHANGELOG.md b/libwvdrmengine/oemcrypto/CHANGELOG.md
index 6ce869a5..ee841319 100644
--- a/libwvdrmengine/oemcrypto/CHANGELOG.md
+++ b/libwvdrmengine/oemcrypto/CHANGELOG.md
@@ -102,7 +102,11 @@ OEMCrypto_BuildInformation(), the `WTPI_BUILD_INFO` macro is no longer required.
   expected keysize. Fixed to include leading zeroes if needed.
 - Bugfix: WPTI_GenerateRandomCertificateKeyPair() was implemented incorrectly.
   It did not return the correct minimum size, used the wrong mbedtls key type,
-  and did not free allocated resources. Fixed all three issues.
+  and did not free allocated resources. Fixed all three issues. Please note
+  that on 64-bit targets, WPTI_GenerateRandomCertificateKeyPair() will exhaust
+  the default memory pool that OP-TEE uses for mbedtls. We suggest increasing
+  MPI_MEMPOOL_SIZE from 12k to 14k in optee_os/lib/libutee/tee_api_arith_mpi.c
+  to avoid this.
 
 ### Trusty port changes