diff --git a/ChangeLog b/ChangeLog
index 7ef0342bc..14b73d894 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,9 @@ Bugfix
      program programs/x509/cert_write. Fixes #1422.
    * Ignore iv in mbedtls_cipher_set_iv() when the cipher mode is MBEDTLS_MODE_ECB
      Fix for #1091 raised by ezdevelop
+   * Fix runtime error in `mbedtls_platform_entropy_poll()` when run
+     through qemu user emulation. Reported and fix suggested by randombit
+     in #1212. Fixes #1212.
 
 Changes
    * "make apidoc" now generates the documentation for the current