diff --git a/Makefile b/Makefile
index 3cb0c42..f98f4c1 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,15 @@ GOFILES=rbot.go handler.go auth.go cmd-access.go cmd-admin.go cmd-op.go cmd-goog
 
 include $(GOROOT)/src/Make.cmd
 
-all: rbot.conf auth.conf
+.PHONY: client goconfig
+
+all: rbot.conf auth.conf client goconfig
+
+client:
+	$(MAKE) -C client install
+
+goconfig:
+	$(MAKE) -C goconfig install
 
 rbot.conf: rbot.conf.example
 	@if [ -f $@ ] ; then \
diff --git a/README.md b/README.md
index 7e23a90..b0f5e68 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,6 @@ Assuming you have go set up (http://golang.org/),
 	cd rbot
 	git submodule init
 	git submodule update
-	gomake -C client install
-	gomake -C goconfig install
 	gomake
 
 rbot.conf and auth.conf will be copied. Configure those and then run the bot: