diff --git a/.claude/settings.json b/.claude/settings.json
new file mode 100644
index 00000000..613613cc
--- /dev/null
+++ b/.claude/settings.json
@@ -0,0 +1,13 @@
+{
+  "extraKnownMarketplaces": {
+    "fling-engine-skills": {
+      "source": {
+        "source": "github",
+        "repo": "flingengine/skills-marketplace"
+      }
+    }
+  },
+  "enabledPlugins": {
+    "fling-engine@fling-engine-skills": true
+  }
+}
diff --git a/AGENTS.md b/AGENTS.md
index e0c61bad..454ebd54 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -59,3 +59,9 @@ platform setup (Vulkan SDK, GLFW, etc.).
 
 `CLAUDE.md` at the repo root imports this file directly (`@AGENTS.md`), so there is
 nothing Claude-specific to duplicate here.
+
+This repo ships a committed `.claude/settings.json` that registers the
+[flingengine/skills-marketplace](https://github.com/flingengine/skills-marketplace)
+marketplace and enables its `fling-engine` plugin (build/test/coding-style/module-
+architecture skills). Opening this repo in Claude Code and trusting the folder will
+offer to install it automatically — no manual `/plugin marketplace add` needed.
diff --git a/Init.sh b/Init.sh
index 8f52f935..61596153 100755
--- a/Init.sh
+++ b/Init.sh
@@ -13,5 +13,24 @@ cmake ./external/Catch2 -B ./external/Catch2/build -DCMAKE_INSTALL_PREFIX=./exte
 make install --directory=./external/Catch2/build -j$(nproc)
 
 # Run cmake!
-echo Running CMake 
+echo Running CMake
 cmake . -B build
+
+# Offer to set up the Fling Engine Claude Code skills marketplace, if Claude Code is
+# installed and the marketplace isn't already registered
+if command -v claude >/dev/null 2>&1; then
+	if claude plugin marketplace list --json 2>/dev/null | grep -q '"name": "fling-engine-skills"'; then
+		echo Fling Engine skills marketplace already registered, skipping.
+	else
+		printf "Claude Code detected. Add the Fling Engine skills marketplace (https://github.com/flingengine/skills-marketplace)? [y/N] "
+		read -r add_marketplace
+		case "$add_marketplace" in
+			[yY]|[yY][eE][sS])
+				claude plugin marketplace add flingengine/skills-marketplace
+				;;
+			*)
+				echo Skipping Claude Code skills marketplace setup.
+				;;
+		esac
+	fi
+fi