diff --git a/Makefile b/Makefile
index d4acb70..ba8b768 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ build/$(PROGRAM) :
 tools : build/thalos-tools
 
 build/thalos-tools :
-	$(GO) build $(GOBUILDFLAGS) -o $@ cmd/tools/main.go cmd/tools/flags.go cmd/tools/bench.go cmd/tools/validate.go
+	$(GO) build $(GOBUILDFLAGS) -o $@ $(shell find cmd/tools -type f -name *.go)
 
 install: build tools
 	install -D build/$(PROGRAM) $(DESTDIR)$(BINDIR)/$(PROGRAM)