diff --git a/include/spdk/nvme_spec.h b/include/spdk/nvme_spec.h
index 68dcdf4b0..cacdc7ca3 100644
--- a/include/spdk/nvme_spec.h
+++ b/include/spdk/nvme_spec.h
@@ -1749,6 +1749,21 @@ struct __attribute__((packed)) spdk_nvme_health_information_page {
 };
 SPDK_STATIC_ASSERT(sizeof(struct spdk_nvme_health_information_page) == 512, "Incorrect size");
 
+/**
+ * Asynchronous Event Configuration
+ */
+union spdk_nvme_async_event_config {
+	uint32_t raw;
+	struct {
+		union spdk_nvme_critical_warning_state crit_warn;
+		uint32_t ns_attr_notice		: 1;
+		uint32_t fw_activation_notice	: 1;
+		uint32_t telemetry_log_notice	: 1;
+		uint32_t reserved		: 21;
+	} bits;
+};
+SPDK_STATIC_ASSERT(sizeof(union spdk_nvme_async_event_config) == 4, "Incorrect size");
+
 /**
  * Firmware slot information page (\ref SPDK_NVME_LOG_FIRMWARE_SLOT)
  */
diff --git a/lib/nvmf/nvmf_internal.h b/lib/nvmf/nvmf_internal.h
index c4bbbf653..8e9c2fc18 100644
--- a/lib/nvmf/nvmf_internal.h
+++ b/lib/nvmf/nvmf_internal.h
@@ -178,14 +178,7 @@ struct spdk_nvmf_ctrlr {
 	int num_qpairs;
 	int max_qpairs_allowed;
 	uint32_t kato;
-	union {
-		uint32_t raw;
-		struct {
-			union spdk_nvme_critical_warning_state crit_warn;
-			uint8_t ns_attr_notice : 1;
-			uint8_t fw_activation_notice : 1;
-		} bits;
-	} async_event_config;
+	union spdk_nvme_async_event_config async_event_config;
 	struct spdk_nvmf_request *aer_req;
 	uint8_t hostid[16];