diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index 2937264f2a..f4fd6eeca4 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -329,7 +329,8 @@ amd_fw_entry amd_psp_fw_table[] = {
 	{ .type = AMD_FW_PSP_SMUSCS, .level = PSP_BOTH | PSP_LVL2_AB },
 	{ .type = AMD_FW_DMCUB, .level = PSP_LVL2 | PSP_LVL2_AB },
 	{ .type = AMD_FW_PSP_BOOTLOADER_AB, .level = PSP_LVL2 | PSP_LVL2_AB },
-	{ .type = AMD_RIB, .level = PSP_LVL2 | PSP_LVL2_AB },
+	{ .type = AMD_RIB, .subprog = 0, .level = PSP_LVL2 | PSP_LVL2_AB },
+	{ .type = AMD_RIB, .subprog = 1, .level = PSP_LVL2 | PSP_LVL2_AB },
 	{ .type = AMD_FW_MPDMA_TF, .level = PSP_BOTH | PSP_BOTH_AB },
 	{ .type = AMD_TA_IKEK, .level = PSP_BOTH | PSP_LVL2_AB, .skip_hashing = true },
 	{ .type = AMD_FW_GMI3_PHY, .level = PSP_BOTH | PSP_BOTH_AB },
diff --git a/util/amdfwtool/data_parse.c b/util/amdfwtool/data_parse.c
index 8a336d90c6..8c22dc514c 100644
--- a/util/amdfwtool/data_parse.c
+++ b/util/amdfwtool/data_parse.c
@@ -411,9 +411,12 @@ static uint8_t find_register_fw_filename_psp_dir(char *fw_name, char *filename,
 	} else if (strcmp(fw_name, "PSP_MPIOFW_FILE") == 0) {
 		fw_type = AMD_FW_MPIO;
 		subprog = 0;
-	} else if (strcmp(fw_name, "PSP_RIB_FILE") == 0) {
+	} else if (strcmp(fw_name, "PSP_RIB_FILE_SUB0") == 0) {
 		fw_type = AMD_RIB;
 		subprog = 0;
+	} else if (strcmp(fw_name, "PSP_RIB_FILE_SUB1") == 0) {
+		fw_type = AMD_RIB;
+		subprog = 1;
 	} else if (strcmp(fw_name, "FEATURE_TABLE_FILE") == 0) {
 		fw_type = AMD_FW_FCFG_TABLE;
 		subprog = 0;