diff --git a/Makefile b/Makefile
index de7d494f..0a6bcf0e 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ export CGO_ENABLED ?= 0
 
 capdef_file = ./irc/caps/defs.go
 
-all: install
+all: build
 
 install:
 	go install -v -ldflags "-X main.commit=$(GIT_COMMIT) -X main.version=$(GIT_TAG)"
@@ -29,13 +29,13 @@ test:
 	go vet ./...
 	./.check-gofmt.sh
 
-smoke:
+smoke: install
 	ergo mkcerts --conf ./default.yaml || true
 	ergo run --conf ./default.yaml --smoke
 
 gofmt:
 	./.check-gofmt.sh --fix
 
-irctest:
+irctest: install
 	git submodule update --init
 	cd irctest && make ergo
diff --git a/README.md b/README.md
index d7fcddf1..63245060 100644
--- a/README.md
+++ b/README.md
@@ -84,7 +84,7 @@ For information on contributing to Ergo, see [DEVELOPING.md](https://github.com/
 
 #### Building
 
-You'll need an [up-to-date distribution of the Go language for your OS and architecture](https://golang.org/dl/). Once that's installed (check the output of `go version`), just check out your desired branch or tag and run `make build`. This will produce an executable binary named `ergo` in the base directory of the project. (Ergo vendors all its dependencies, so you will not need to fetch any dependencies remotely.)
+You'll need an [up-to-date distribution of the Go language for your OS and architecture](https://golang.org/dl/). Once that's installed (check the output of `go version`), just check out your desired branch or tag and run `make`. This will produce an executable binary named `ergo` in the base directory of the project. (Ergo vendors all its dependencies, so you will not need to fetch any dependencies remotely.)
 
 ## Configuration