diff --git a/esp_idf_panic_decoder/gdb_panic_server.py b/esp_idf_panic_decoder/gdb_panic_server.py
index 9bb788e..f0fe5e2 100644
--- a/esp_idf_panic_decoder/gdb_panic_server.py
+++ b/esp_idf_panic_decoder/gdb_panic_server.py
@@ -63,6 +63,8 @@
     'esp32c6': GDB_REGS_INFO_RISCV_ILP32,
     'esp32h2': GDB_REGS_INFO_RISCV_ILP32,
     'esp32p4': GDB_REGS_INFO_RISCV_ILP32,
+    'esp32c5': GDB_REGS_INFO_RISCV_ILP32,
+    'esp32c61': GDB_REGS_INFO_RISCV_ILP32,
 }
 
 PanicInfo = namedtuple('PanicInfo', 'core_id regs stack_base_addr stack_data')
@@ -159,6 +161,8 @@ def parse_idf_riscv_panic_output(panic_text):  # type: (str) -> PanicInfo
     'esp32c6': parse_idf_riscv_panic_output,
     'esp32h2': parse_idf_riscv_panic_output,
     'esp32p4': parse_idf_riscv_panic_output,
+    'esp32c5': parse_idf_riscv_panic_output,
+    'esp32c61': parse_idf_riscv_panic_output,
 }