diff --git a/ChangeLog.d/9126.txt b/ChangeLog.d/psa/9126.txt
similarity index 100%
rename from ChangeLog.d/9126.txt
rename to ChangeLog.d/psa/9126.txt
diff --git a/ChangeLog.d/9302.txt b/ChangeLog.d/psa/9302.txt
similarity index 100%
rename from ChangeLog.d/9302.txt
rename to ChangeLog.d/psa/9302.txt
diff --git a/ChangeLog.d/9690.txt b/ChangeLog.d/psa/9690.txt
similarity index 100%
rename from ChangeLog.d/9690.txt
rename to ChangeLog.d/psa/9690.txt
diff --git a/ChangeLog.d/MBEDTLS_PSA_HMAC_DRBG_MD_TYPE.txt b/ChangeLog.d/psa/MBEDTLS_PSA_HMAC_DRBG_MD_TYPE.txt
similarity index 100%
rename from ChangeLog.d/MBEDTLS_PSA_HMAC_DRBG_MD_TYPE.txt
rename to ChangeLog.d/psa/MBEDTLS_PSA_HMAC_DRBG_MD_TYPE.txt
diff --git a/ChangeLog.d/add-psa-iop-generate-key.txt b/ChangeLog.d/psa/add-psa-iop-generate-key.txt
similarity index 100%
rename from ChangeLog.d/add-psa-iop-generate-key.txt
rename to ChangeLog.d/psa/add-psa-iop-generate-key.txt
diff --git a/ChangeLog.d/add-psa-iop-key-agreement.txt b/ChangeLog.d/psa/add-psa-iop-key-agreement.txt
similarity index 100%
rename from ChangeLog.d/add-psa-iop-key-agreement.txt
rename to ChangeLog.d/psa/add-psa-iop-key-agreement.txt
diff --git a/ChangeLog.d/add-psa-key-agreement.txt b/ChangeLog.d/psa/add-psa-key-agreement.txt
similarity index 100%
rename from ChangeLog.d/add-psa-key-agreement.txt
rename to ChangeLog.d/psa/add-psa-key-agreement.txt
diff --git a/ChangeLog.d/configuration-split.txt b/ChangeLog.d/psa/configuration-split.txt
similarity index 100%
rename from ChangeLog.d/configuration-split.txt
rename to ChangeLog.d/psa/configuration-split.txt
diff --git a/ChangeLog.d/dynamic-keystore.txt b/ChangeLog.d/psa/dynamic-keystore.txt
similarity index 100%
rename from ChangeLog.d/dynamic-keystore.txt
rename to ChangeLog.d/psa/dynamic-keystore.txt
diff --git a/ChangeLog.d/ecdsa-conversion-overflow.txt b/ChangeLog.d/psa/ecdsa-conversion-overflow.txt
similarity index 100%
rename from ChangeLog.d/ecdsa-conversion-overflow.txt
rename to ChangeLog.d/psa/ecdsa-conversion-overflow.txt
diff --git a/ChangeLog.d/fix-aesni-asm-clobbers.txt b/ChangeLog.d/psa/fix-aesni-asm-clobbers.txt
similarity index 100%
rename from ChangeLog.d/fix-aesni-asm-clobbers.txt
rename to ChangeLog.d/psa/fix-aesni-asm-clobbers.txt
diff --git a/ChangeLog.d/fix-clang-psa-build-without-dhm.txt b/ChangeLog.d/psa/fix-clang-psa-build-without-dhm.txt
similarity index 100%
rename from ChangeLog.d/fix-clang-psa-build-without-dhm.txt
rename to ChangeLog.d/psa/fix-clang-psa-build-without-dhm.txt
diff --git a/ChangeLog.d/fix-psa-cmac.txt b/ChangeLog.d/psa/fix-psa-cmac.txt
similarity index 100%
rename from ChangeLog.d/fix-psa-cmac.txt
rename to ChangeLog.d/psa/fix-psa-cmac.txt
diff --git a/ChangeLog.d/fix-redefination_warning_messages_for_GNU_SOURCE.txt b/ChangeLog.d/psa/fix-redefination_warning_messages_for_GNU_SOURCE.txt
similarity index 100%
rename from ChangeLog.d/fix-redefination_warning_messages_for_GNU_SOURCE.txt
rename to ChangeLog.d/psa/fix-redefination_warning_messages_for_GNU_SOURCE.txt
diff --git a/ChangeLog.d/fix-rsa-performance-regression.txt b/ChangeLog.d/psa/fix-rsa-performance-regression.txt
similarity index 100%
rename from ChangeLog.d/fix-rsa-performance-regression.txt
rename to ChangeLog.d/psa/fix-rsa-performance-regression.txt
diff --git a/ChangeLog.d/fix-secure-element-key-creation.txt b/ChangeLog.d/psa/fix-secure-element-key-creation.txt
similarity index 100%
rename from ChangeLog.d/fix-secure-element-key-creation.txt
rename to ChangeLog.d/psa/fix-secure-element-key-creation.txt
diff --git a/ChangeLog.d/fix-test-suite-pk-warnings.txt b/ChangeLog.d/psa/fix-test-suite-pk-warnings.txt
similarity index 100%
rename from ChangeLog.d/fix-test-suite-pk-warnings.txt
rename to ChangeLog.d/psa/fix-test-suite-pk-warnings.txt
diff --git a/ChangeLog.d/fix_ubsan_mp_aead_gcm.txt b/ChangeLog.d/psa/fix_ubsan_mp_aead_gcm.txt
similarity index 100%
rename from ChangeLog.d/fix_ubsan_mp_aead_gcm.txt
rename to ChangeLog.d/psa/fix_ubsan_mp_aead_gcm.txt
diff --git a/ChangeLog.d/mbedtls_psa_ecp_generate_key-no_public_key.txt b/ChangeLog.d/psa/mbedtls_psa_ecp_generate_key-no_public_key.txt
similarity index 100%
rename from ChangeLog.d/mbedtls_psa_ecp_generate_key-no_public_key.txt
rename to ChangeLog.d/psa/mbedtls_psa_ecp_generate_key-no_public_key.txt
diff --git a/ChangeLog.d/mbedtls_psa_register_se_key.txt b/ChangeLog.d/psa/mbedtls_psa_register_se_key.txt
similarity index 100%
rename from ChangeLog.d/mbedtls_psa_register_se_key.txt
rename to ChangeLog.d/psa/mbedtls_psa_register_se_key.txt
diff --git a/ChangeLog.d/mbedtls_psa_rsa_load_representation-memory_leak.txt b/ChangeLog.d/psa/mbedtls_psa_rsa_load_representation-memory_leak.txt
similarity index 100%
rename from ChangeLog.d/mbedtls_psa_rsa_load_representation-memory_leak.txt
rename to ChangeLog.d/psa/mbedtls_psa_rsa_load_representation-memory_leak.txt
diff --git a/ChangeLog.d/pk-norsa-warning.txt b/ChangeLog.d/psa/pk-norsa-warning.txt
similarity index 100%
rename from ChangeLog.d/pk-norsa-warning.txt
rename to ChangeLog.d/psa/pk-norsa-warning.txt
diff --git a/ChangeLog.d/psa-always-on.txt b/ChangeLog.d/psa/psa-always-on.txt
similarity index 100%
rename from ChangeLog.d/psa-always-on.txt
rename to ChangeLog.d/psa/psa-always-on.txt
diff --git a/ChangeLog.d/psa-crypto-config-always-on.txt b/ChangeLog.d/psa/psa-crypto-config-always-on.txt
similarity index 100%
rename from ChangeLog.d/psa-crypto-config-always-on.txt
rename to ChangeLog.d/psa/psa-crypto-config-always-on.txt
diff --git a/ChangeLog.d/psa_cipher_decrypt-ccm_star-iv_length_enforcement.txt b/ChangeLog.d/psa/psa_cipher_decrypt-ccm_star-iv_length_enforcement.txt
similarity index 100%
rename from ChangeLog.d/psa_cipher_decrypt-ccm_star-iv_length_enforcement.txt
rename to ChangeLog.d/psa/psa_cipher_decrypt-ccm_star-iv_length_enforcement.txt
diff --git a/ChangeLog.d/psa_generate_key_custom.txt b/ChangeLog.d/psa/psa_generate_key_custom.txt
similarity index 100%
rename from ChangeLog.d/psa_generate_key_custom.txt
rename to ChangeLog.d/psa/psa_generate_key_custom.txt
diff --git a/ChangeLog.d/psa_util_in_builds_without_psa.txt b/ChangeLog.d/psa/psa_util_in_builds_without_psa.txt
similarity index 100%
rename from ChangeLog.d/psa_util_in_builds_without_psa.txt
rename to ChangeLog.d/psa/psa_util_in_builds_without_psa.txt
diff --git a/ChangeLog.d/remove-crypto-alt-interface.txt b/ChangeLog.d/psa/remove-crypto-alt-interface.txt
similarity index 100%
rename from ChangeLog.d/remove-crypto-alt-interface.txt
rename to ChangeLog.d/psa/remove-crypto-alt-interface.txt
diff --git a/ChangeLog.d/remove-via-padlock-support.txt b/ChangeLog.d/psa/remove-via-padlock-support.txt
similarity index 100%
rename from ChangeLog.d/remove-via-padlock-support.txt
rename to ChangeLog.d/psa/remove-via-padlock-support.txt