diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce0e023..70055eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
 3. oem: ibm: Add chapdata file type support
 4. base: Added PLDM_SMBIOS & PLDM_RDE message types
 5. oem: meta: Add decode_oem_meta_file_io_req()
+6. state-set: Add all state set values to system power state enum as per DSP0249
 
 ### Changed
 
diff --git a/include/libpldm/state_set.h b/include/libpldm/state_set.h
index bddfeb3..8e86529 100644
--- a/include/libpldm/state_set.h
+++ b/include/libpldm/state_set.h
@@ -231,7 +231,19 @@
 /* @brief List of states for the System Power State set (ID 260).
  */
 enum pldm_state_set_system_power_state_values {
-	PLDM_STATE_SET_SYS_POWER_STATE_OFF_SOFT_GRACEFUL = 9
+	PLDM_STATE_SET_SYS_POWER_STATE_ON = 1,
+	PLDM_STATE_SET_SYS_POWER_STATE_HIBERNATE = 2,
+	PLDM_STATE_SET_SYS_POWER_STATE_SLEEP_LIGHT = 3,
+	PLDM_STATE_SET_SYS_POWER_STATE_SLEEP_DEEP = 4,
+	PLDM_STATE_SET_SYS_POWER_CYCLE_SOFT = 5,
+	PLDM_STATE_SET_SYS_POWER_CYCLE_HARD = 6,
+	PLDM_STATE_SET_SYS_POWER_CYCLE_OFF_SOFT_GRACEFUL = 7,
+	PLDM_STATE_SET_SYS_POWER_CYCLE_OFF_HARD_GRACEFUL = 8,
+	PLDM_STATE_SET_SYS_POWER_STATE_OFF_SOFT_GRACEFUL = 9,
+	PLDM_STATE_SET_SYS_POWER_STATE_OFF_HARD_GRACEFUL = 10,
+	PLDM_STATE_SET_SYS_POWER_STATE_MASTER_BUS_RESET = 11,
+	PLDM_STATE_SET_SYS_POWER_STATE_MASTER_BUS_RESET_GRACEFUL = 12,
+	PLDM_STATE_SET_SYS_POWER_STATE_NMI = 13,
 };
 
 /* @brief List of states for Device Power State set (ID 257).