diff --git a/ChangeLog.d/add-block-cipher-no-decrypt.txt b/ChangeLog.d/add-block-cipher-no-decrypt.txt
new file mode 100644
index 000000000..755eda35a
--- /dev/null
+++ b/ChangeLog.d/add-block-cipher-no-decrypt.txt
@@ -0,0 +1,6 @@
+Features
+   * Add support to remove decryption operation for cipher type of AES, ARIA
+     and CAMELLIA. A new configuration option, MBEDTLS_BLOCK_CIPHER_NO_DECRYPT
+     can be used to enable this feature.
+     Note that this configuration option is incompatible with MBEDTLS_DES_C,
+     MBEDTLS_CIPHER_MODE_CBC, MBEDTLS_CIPHER_MODE_XTS and MBEDTLS_NIST_KW_C.
diff --git a/ChangeLog.d/add-cipher-encrypt-only.txt b/ChangeLog.d/add-cipher-encrypt-only.txt
deleted file mode 100644
index d56c08da3..000000000
--- a/ChangeLog.d/add-cipher-encrypt-only.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Features
-   * Add support to remove xxx_setkey_dec and xxx_decrypt for cipher type of
-     AES, ARIA, CAMELLIA and DES. This is achieved by implicitly enabling
-     MBEDTLS_BLOCK_CIPHER_NO_DECRYPT when
-     - ECB and CBC cipher modes are not requested via the PSA API.
-     - ECB, CBC, XTS and KW are not enabled in the legacy API.
-     - DES is not requested in the PSA API and the legacy API.