diff --git a/Makefile b/Makefile
index 7f8c817..844a9d3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Flynn Makefile
 # Self-hosted personal AI agent
 
-.PHONY: build dev start stop restart status logs tui tui-fs tui-dev test test-run lint typecheck check help deps install daemon-start daemon-stop daemon-restart daemon-status daemon-logs enable disable llama-start llama-stop llama-restart llama-status llama-logs llama-enable llama-disable
+.PHONY: build dev start stop restart status logs tui tui-fs tui-dev test test-run lint typecheck check help deps install daemon-start daemon-stop daemon-restart daemon-status daemon-logs enable disable llama-start llama-stop llama-restart llama-status llama-logs llama-enable llama-disable skills-list skills-info skills-install skills-uninstall skills-refresh
 
 # Default target
 .DEFAULT_GOAL := help
@@ -86,6 +86,25 @@ tui-fs: ## Run TUI in fullscreen mode (React/Ink)
 tui-dev: ## Run TUI with watch mode
 	pnpm tui:dev
 
+# Skills commands
+skills-list: ## List all discovered skills
+	node dist/cli/index.js skills list
+
+skills-info: ## Show skill details (usage: make skills-info SKILL=<name>)
+	@test -n "$(SKILL)" || (echo "Usage: make skills-info SKILL=<name>" && exit 1)
+	node dist/cli/index.js skills info "$(SKILL)"
+
+skills-install: ## Install a skill (usage: make skills-install SKILL_PATH=<path>)
+	@test -n "$(SKILL_PATH)" || (echo "Usage: make skills-install SKILL_PATH=<path>" && exit 1)
+	node dist/cli/index.js skills install "$(SKILL_PATH)"
+
+skills-uninstall: ## Uninstall a skill (usage: make skills-uninstall SKILL=<name>)
+	@test -n "$(SKILL)" || (echo "Usage: make skills-uninstall SKILL=<name>" && exit 1)
+	node dist/cli/index.js skills uninstall "$(SKILL)" --yes
+
+skills-refresh: ## Refresh/discover skills from configured directories
+	node dist/cli/index.js skills refresh
+
 # Testing
 test: ## Run tests in watch mode
 	pnpm test
diff --git a/docs/plans/state.json b/docs/plans/state.json
index 8955199..ac4970c 100644
--- a/docs/plans/state.json
+++ b/docs/plans/state.json
@@ -3,6 +3,17 @@
   "updated_at": "2026-02-17",
   "description": "Tracks the status of all Flynn plans and implementation phases",
   "plans": {
+    "makefile-skills-convenience-targets": {
+      "status": "completed",
+      "date": "2026-02-17",
+      "updated": "2026-02-17",
+      "summary": "Added non-interactive Makefile convenience targets for skills workflows (`skills-list`, `skills-info`, `skills-install`, `skills-uninstall`, `skills-refresh`) with explicit argument validation for `SKILL`/`SKILL_PATH` so they are shell- and CI-friendly.",
+      "files_modified": [
+        "Makefile",
+        "docs/plans/state.json"
+      ],
+      "test_status": "make help lists new skills targets"
+    },
     "setup-research-agent-enablement": {
       "status": "completed",
       "date": "2026-02-17",