diff --git a/registry.toml b/registry.toml
index c89ce96561..f9aefae04c 100644
--- a/registry.toml
+++ b/registry.toml
@@ -554,6 +554,16 @@ claude.aliases = ["claude-code"]
 claude.description = "Claude Code is an agentic coding tool that lives in your terminal, understands your codebase, and helps you code faster by executing routine tasks, explaining complex code, and handling git workflows -- all through natural language commands"
 claude.backends = ["npm:@anthropic-ai/claude-code"]
 claude.test = ["claude --version", "{{version}} (Claude Code)"]
+claude-squad.description = "Manage multiple AI agents like Claude Code, Aider, Codex, and Amp. 10x your productivity"
+claude-squad.backends = [
+    "aqua:smtg-ai/claude-squad",
+    "ubi:smtg-ai/claude-squad"
+]
+claude-squad.test = [
+    "claude-squad version",
+    """claude-squad version {{version}}
+https://github.com/smtg-ai/claude-squad/releases/tag/v{{version}}"""
+]
 cli53.description = "Command line tool for Amazon Route 53"
 cli53.backends = ["aqua:barnybug/cli53"]
 cli53.test = ["cli53 --version", "cli53 version {{version}}"]