diff --git a/src/mcp_scan/well_known_clients.py b/src/mcp_scan/well_known_clients.py
index 0deaa58d..5cd9fa68 100644
--- a/src/mcp_scan/well_known_clients.py
+++ b/src/mcp_scan/well_known_clients.py
@@ -53,10 +53,16 @@
         skills_dir_paths=["~/.gemini/skills"],
     ),
     CandidateClient(
-        name="clawdbot",
-        client_exists_paths=["~/.clawdbot"],
+        name="openclaw",
+        client_exists_paths=["~/.clawdbot", "~/.openclaw"],
+        mcp_config_paths=[],
+        skills_dir_paths=["~/.clawdbot/skills", "~/.openclaw/skills", "~/.openclaw/workspace/skills", ".openclaw/skills"],
+    ),
+    CandidateClient(
+        name="amp",
+        client_exists_paths=["~/.config/agents", ".amp"],
         mcp_config_paths=[],
-        skills_dir_paths=["~/.clawdbot/skills"],
+        skills_dir_paths=["~/.config/agents/skills", ".amp/skills"],
     ),
     CandidateClient(
         name="kiro",
@@ -123,7 +129,13 @@
         name="openclaw",
         client_exists_paths=["~/.clawdbot", "~/.openclaw"],
         mcp_config_paths=[],
-        skills_dir_paths=["~/.clawdbot/skills", "~/.openclaw/skills"],
+        skills_dir_paths=["~/.clawdbot/skills", "~/.openclaw/skills", "~/.openclaw/workspace/skills", ".openclaw/skills"],
+    ),
+    CandidateClient(
+        name="amp",
+        client_exists_paths=["~/.config/agents", ".amp"],
+        mcp_config_paths=[],
+        skills_dir_paths=["~/.config/agents/skills", ".amp/skills"],
     ),
     CandidateClient(
         name="kiro",
@@ -197,7 +209,13 @@
         name="openclaw",
         client_exists_paths=["~/.clawdbot", "~/.openclaw"],
         mcp_config_paths=[],
-        skills_dir_paths=["~/.clawdbot/skills", "~/.openclaw/skills"],
+        skills_dir_paths=["~/.clawdbot/skills", "~/.openclaw/skills", "~/.openclaw/workspace/skills", ".openclaw/skills"],
+    ),
+    CandidateClient(
+        name="amp",
+        client_exists_paths=["~/.config/agents", ".amp"],
+        mcp_config_paths=[],
+        skills_dir_paths=["~/.config/agents/skills", ".amp/skills"],
     ),
 ]