diff --git a/Makefile b/Makefile
index 60a2c19a9..9b7489e7c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 DEPS = $(shell go list -f '{{range .TestImports}}{{.}} {{end}}' ./...)
+PACKAGES = $(shell go list ./...)
 
 all: deps
 	@mkdir -p bin/
@@ -18,6 +19,9 @@ test: deps
 integ:
 	go list ./... | INTEG_TESTS=yes xargs -n1 go test
 
+format:
+	go fmt $(PACKAGES)
+
 web:
 	./scripts/website_run.sh