diff --git a/9p b/9p
index 23dd7fc..80c3f20 160000
--- a/9p
+++ b/9p
@@ -1 +1 @@
-Subproject commit 23dd7fc4903cb3ab500cff96d8ea90c35e5322e2
+Subproject commit 80c3f20609ffd1709e0236c16866bbfdd962743e
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..5def167
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,102 @@
+# Build all Ollie projects in sequence
+#
+# Usage:
+#   make            # build everything
+#   make core       # build only core
+#   make 9p         # build only 9p
+#   make httpgw     # build only httpgw
+#   make all        # build everything (default)
+
+.PHONY: all core 9p acme httpgw webui data scripts contrib help
+
+all: core 9p acme httpgw webui data scripts contrib
+
+core:
+	@echo === Building ollie-core ===
+	$(MAKE) -C core
+
+9p:
+	@echo === Building ollie-9p ===
+	$(MAKE) -C 9p
+
+acme:
+	@echo === Building ollie-acme ===
+	$(MAKE) -C acme
+
+httpgw:
+	@echo === Building ollie-httpgw ===
+	$(MAKE) -C httpgw
+
+webui:
+	@echo === Building ollie-webui ===
+	cd webui && npm run build
+
+data:
+	@echo === Installing data ===
+	mkdir -p $(HOME)/.config/ollie/agents
+	mkdir -p $(HOME)/.config/ollie/sandbox
+	mkdir -p $(HOME)/.config/ollie/skills
+	mkdir -p $(HOME)/.config/ollie/tools
+	rm -rf $(HOME)/.config/ollie/prompts
+	mkdir -p $(HOME)/.config/ollie/prompts
+	cp -rf agents/* $(HOME)/.config/ollie/agents
+	cp -rf prompts/* $(HOME)/.config/ollie/prompts
+	cp -rf sandbox/* $(HOME)/.config/ollie/sandbox
+	cp -rf skills/* $(HOME)/.config/ollie/skills
+	cp -rf tools/_lib $(HOME)/.config/ollie/tools/_lib
+	cp -rf tools/* $(HOME)/.config/ollie/tools
+	cp -rf tools/cascade $(HOME)/.config/ollie/tools/cascade
+	cp doc/help.md $(HOME)/.config/ollie/help.md
+
+scripts:
+	@echo === Installing scripts ===
+	mkdir -p $(HOME)/.config/ollie/scripts/s $(HOME)/.config/ollie/scripts/u $(HOME)/.config/ollie/scripts/x
+	cp -f scripts/s/sh      $(HOME)/.config/ollie/scripts/s/sh
+	cp -f scripts/s/ls      $(HOME)/.config/ollie/scripts/s/ls
+	cp -f scripts/s/kill    $(HOME)/.config/ollie/scripts/s/kill
+	cp -f scripts/s/b       $(HOME)/.config/ollie/scripts/s/b
+	cp -f scripts/s/bfg     $(HOME)/.config/ollie/scripts/s/bfg
+	cp -f scripts/s/bbg     $(HOME)/.config/ollie/scripts/s/bbg
+	cp -f scripts/s/cleanup $(HOME)/.config/ollie/scripts/s/cleanup
+	cp -f scripts/u/optimize  $(HOME)/.config/ollie/scripts/u/optimize
+	cp -f scripts/u/complete  $(HOME)/.config/ollie/scripts/u/complete
+	cp -f scripts/u/cascade   $(HOME)/.config/ollie/scripts/u/cascade
+	cp -f scripts/x/elevate $(HOME)/.config/ollie/scripts/x/elevate
+	cp -f scripts/x/elevate-adapter-superpowerd $(HOME)/.config/ollie/scripts/x/elevate-adapter-superpowerd
+	cp -f scripts/x/elevate-adapter-start $(HOME)/.config/ollie/scripts/x/elevate-adapter-start
+	cp -f scripts/x/bd     $(HOME)/.config/ollie/scripts/x/bd
+	cp -f scripts/x/prime  $(HOME)/.config/ollie/scripts/x/prime
+	cp -f scripts/x/freeloader $(HOME)/.config/ollie/scripts/x/freeloader
+	chmod 755 \
+		$(HOME)/.config/ollie/scripts/s/b \
+		$(HOME)/.config/ollie/scripts/s/bfg \
+		$(HOME)/.config/ollie/scripts/s/bbg \
+		$(HOME)/.config/ollie/scripts/s/cleanup \
+		$(HOME)/.config/ollie/scripts/u/optimize \
+		$(HOME)/.config/ollie/scripts/u/complete \
+		$(HOME)/.config/ollie/scripts/u/cascade \
+		$(HOME)/.config/ollie/scripts/x/elevate \
+		$(HOME)/.config/ollie/scripts/x/elevate-adapter-superpowerd \
+		$(HOME)/.config/ollie/scripts/x/elevate-adapter-start \
+		$(HOME)/.config/ollie/scripts/x/bd \
+		$(HOME)/.config/ollie/scripts/x/prime \
+		$(HOME)/.config/ollie/scripts/x/freeloader
+
+contrib:
+	@echo === Installing contrib scripts ===
+	cp -f contrib/ollie-remount $(HOME)/bin/ollie-remount
+	chmod 755 $(HOME)/bin/ollie-remount
+
+help:
+	@echo 'Ollie monorepo build targets:'
+	@echo '  all     - Build all projects and install data (default)'
+	@echo '  core    - Build core library'
+	@echo '  9p      - Build 9p filesystem server'
+	@echo '  httpgw  - Build HTTP gateway'
+	@echo '  webui   - Build web UI'
+	@echo '  data    - Install agents, prompts, skills, and tools to ~/.config/ollie/'
+	@echo '  scripts - Install shell scripts to ~/.config/ollie/scripts/'
+	@echo '  contrib - Install contrib scripts to ~/bin/'
+	@echo ''
+	@echo 'Submodules must be initialized first:'
+	@echo '  git submodule update --init --recursive'
diff --git a/acme b/acme
index 62051f6..4f93c74 160000
--- a/acme
+++ b/acme
@@ -1 +1 @@
-Subproject commit 62051f678237c98ddfc8c22843eb00e057780546
+Subproject commit 4f93c7499a2d57adebdbb4ac9b99cc3564500bd2
diff --git a/core b/core
index 391f633..72ae801 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 391f633785e50ef6bc8578885ca5c19111c15c45
+Subproject commit 72ae801e3fba9f09ee0d602676702e8e9dd03a13
diff --git a/httpgw b/httpgw
index 11b542c..1f9052d 160000
--- a/httpgw
+++ b/httpgw
@@ -1 +1 @@
-Subproject commit 11b542c2179c43da6991e7f53cb5f518ba2b73db
+Subproject commit 1f9052db762732b6b5ecc57237b5054b037271a4