diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
index 21a0fa283644d..df2b33bdcc1b8 100644
--- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
@@ -4743,6 +4743,10 @@ bool ParseRegisters(
                   "format and encoding for gdb type %s",
                   gdb_type.c_str());
             }
+
+            if (gdb_type == "cheriot capability") {
+              reg_info.format = eFormatCheriotCapability;
+            }
           }
         }