diff --git a/ChangeLog.d/ssl_cnsa_preset.txt b/ChangeLog.d/ssl_cnsa_preset.txt
new file mode 100644
index 0000000000..b14c3428fd
--- /dev/null
+++ b/ChangeLog.d/ssl_cnsa_preset.txt
@@ -0,0 +1,2 @@
+Features
+   * Add support for CNSA preset that supersedes NSA SuiteB.
diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h
index 00e28442d6..8f12a3e638 100644
--- a/include/mbedtls/ssl.h
+++ b/include/mbedtls/ssl.h
@@ -335,6 +335,7 @@
 
 #define MBEDTLS_SSL_PRESET_DEFAULT              0
 #define MBEDTLS_SSL_PRESET_SUITEB               2
+#define MBEDTLS_SSL_PRESET_CNSA                 3
 
 #define MBEDTLS_SSL_CERT_REQ_CA_LIST_ENABLED       1
 #define MBEDTLS_SSL_CERT_REQ_CA_LIST_DISABLED      0
diff --git a/include/mbedtls/x509_crt.h b/include/mbedtls/x509_crt.h
index 0a7b532404..b74b8c6c0a 100644
--- a/include/mbedtls/x509_crt.h
+++ b/include/mbedtls/x509_crt.h
@@ -339,6 +339,11 @@ extern const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_next;
  */
 extern const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_suiteb;
 
+/**
+ * CNSA profile.
+ */
+extern const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_cnsa;
+
 /**
  * Empty profile that allows nothing. Useful as a basis for constructing
  * custom profiles.
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 0195576213..e224c9ea13 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -5261,6 +5261,16 @@ static const int ssl_preset_suiteb_ciphersuites[] = {
     0
 };
 
+/* As per rfc9151 */
+static const int ssl_preset_cnsa_ciphersuites[] = {
+    MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
+    MBEDTLS_TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
+    MBEDTLS_TLS_RSA_WITH_AES_256_GCM_SHA384,
+    MBEDTLS_TLS_DHE_RSA_WITH_AES_256_GCM_SHA384,
+    MBEDTLS_TLS1_3_AES_256_GCM_SHA384,
+    0
+};
+
 #if defined(MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED)
 
 /* NOTICE:
@@ -5405,6 +5415,38 @@ static const uint16_t ssl_tls12_preset_suiteb_sig_algs[] = {
 };
 #endif /* MBEDTLS_SSL_PROTO_TLS1_2 */
 
+
+/* As per rfc9151 */
+static const uint16_t ssl_preset_cnsa_sig_algs[] = {
+#if defined(MBEDTLS_KEY_EXCHANGE_ECDSA_CERT_REQ_ANY_ALLOWED_ENABLED) && \
+    defined(PSA_WANT_ALG_SHA_384) && \
+    defined(PSA_WANT_ECC_SECP_R1_384)
+    MBEDTLS_TLS1_3_SIG_ECDSA_SECP384R1_SHA384,
+#endif
+#if defined(MBEDTLS_RSA_C) && defined(PSA_WANT_ALG_SHA_384)
+    MBEDTLS_TLS1_3_SIG_RSA_PSS_PSS_SHA384,
+#endif
+#if defined(MBEDTLS_X509_RSASSA_PSS_SUPPORT) && defined(PSA_WANT_ALG_SHA_384)
+    MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA384,
+#endif
+    MBEDTLS_TLS_SIG_NONE
+};
+
+
+#if defined(MBEDTLS_SSL_PROTO_TLS1_2)
+static const uint16_t ssl_tls12_preset_cnsa_sig_algs[] = {
+#if defined(MBEDTLS_KEY_EXCHANGE_ECDSA_CERT_REQ_ANY_ALLOWED_ENABLED) && \
+    defined(PSA_WANT_ALG_SHA_384) && \
+    defined(PSA_WANT_ECC_SECP_R1_384)
+    MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG(MBEDTLS_SSL_SIG_ECDSA, MBEDTLS_SSL_HASH_SHA384),
+#endif
+#if defined(MBEDTLS_RSA_C) && defined(PSA_WANT_ALG_SHA_384)
+    MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG(MBEDTLS_SSL_SIG_RSA, MBEDTLS_SSL_HASH_SHA384),
+#endif
+    MBEDTLS_TLS_SIG_NONE
+};
+#endif /* MBEDTLS_SSL_PROTO_TLS1_2 */
+
 #endif /* MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED */
 
 static const uint16_t ssl_preset_suiteb_groups[] = {
@@ -5417,6 +5459,18 @@ static const uint16_t ssl_preset_suiteb_groups[] = {
     MBEDTLS_SSL_IANA_TLS_GROUP_NONE
 };
 
+static const uint16_t ssl_preset_cnsa_groups[] = {
+#if defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED)
+    MBEDTLS_SSL_IANA_TLS_GROUP_SECP384R1,
+#endif
+#if defined(PSA_WANT_ALG_FFDH)
+    MBEDTLS_SSL_IANA_TLS_GROUP_FFDHE3072,
+    MBEDTLS_SSL_IANA_TLS_GROUP_FFDHE4096,
+#endif
+    MBEDTLS_SSL_IANA_TLS_GROUP_NONE
+};
+
+
 #if defined(MBEDTLS_DEBUG_C) && defined(MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED)
 /* Function for checking `ssl_preset_*_sig_algs` and `ssl_tls12_preset_*_sig_algs`
  * to make sure there are no duplicated signature algorithm entries. */
@@ -5567,6 +5621,29 @@ int mbedtls_ssl_config_defaults(mbedtls_ssl_config *conf,
      * Preset-specific defaults
      */
     switch (preset) {
+        /*
+         * CNSA
+         */
+        case MBEDTLS_SSL_PRESET_CNSA:
+
+            conf->ciphersuite_list = ssl_preset_cnsa_ciphersuites;
+#if defined(MBEDTLS_X509_CRT_PARSE_C)
+            conf->cert_profile = &mbedtls_x509_crt_profile_cnsa;
+#endif
+#if defined(MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED)
+#if defined(MBEDTLS_SSL_PROTO_TLS1_2)
+            if (mbedtls_ssl_conf_is_tls12_only(conf)) {
+                conf->sig_algs = ssl_tls12_preset_cnsa_sig_algs;
+            } else
+#endif /* MBEDTLS_SSL_PROTO_TLS1_2 */
+            conf->sig_algs = ssl_preset_cnsa_sig_algs;
+#endif /* MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED */
+#if defined(MBEDTLS_ECP_C) && !defined(MBEDTLS_DEPRECATED_REMOVED)
+            conf->curve_list = NULL;
+#endif
+            conf->group_list = ssl_preset_cnsa_groups;
+            break;
+
         /*
          * NSA Suite B
          */
diff --git a/library/x509_crt.c b/library/x509_crt.c
index a6fcd1b4e6..e502348aac 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -156,6 +156,24 @@ const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_suiteb =
     0,
 };
 
+/*
+ * CNSA profile
+ */
+const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_cnsa =
+{
+    MBEDTLS_X509_ID_FLAG(MBEDTLS_MD_SHA384),
+    MBEDTLS_X509_ID_FLAG(MBEDTLS_PK_RSA) |
+    MBEDTLS_X509_ID_FLAG(MBEDTLS_PK_RSASSA_PSS) |
+    MBEDTLS_X509_ID_FLAG(MBEDTLS_PK_ECDSA) |
+    MBEDTLS_X509_ID_FLAG(MBEDTLS_PK_ECKEY),
+#if defined(PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY)
+    MBEDTLS_X509_ID_FLAG(MBEDTLS_ECP_DP_SECP384R1),
+#else
+    0,
+#endif /* MBEDTLS_PK_HAVE_ECC_KEYS */
+    3072,
+};
+
 /*
  * Empty / all-forbidden profile
  */