diff --git a/Makefile b/Makefile
index 847114ac788c3d8549ca0da5afff752819e800e6..5d7964c9f54f8743f2533a26c749c5b39e8da04d 100644
--- a/Makefile
+++ b/Makefile
@@ -14,10 +14,8 @@ sysconfdir = /etc/djrandom
 all: version.go $(JS_TARGET)
 
 install: all
-	go get ./server/...
-	go get ./mapreduce/...
-	go install ./server/...
-	go install ./mapreduce/...
+	(for dir in server services mapreduce ; do \
+	 go get ./$${dir}/... && go install ./$${dir}/... ; done)
 	rsync -ar ./ui/static/ $(sysconfdir)/static/
 	rsync -ar ./ui/templates/ $(sysconfdir)/templates/
 	install -m 755 -o root -g root djrandom.init /etc/init.d/djrandom