diff --git a/Makefile b/Makefile
index 645b7ad..be4d12a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,9 @@
 FMTFLAGS = -l -w -s
 BUILD_DIR = build
 
+WATCHER_FILES = $(wildcard cmd/watcher/*.go)
+WATCHER_FILES = $(wildcard cmd/webapp/*.go)
+
 TACITUS_FILES = $(wildcard *.go)
 GDAX_FILES = $(wildcard gdax/*.go)
 GDAX_WEBSOCKET_FILES = $(wildcard gdax/websocket/*.go)
@@ -39,14 +42,14 @@ vet: $(TACITUS_FILES) $(OSUTIL_FILES) $(POSTGRES_FILES) $(OPS_FILES) \
 	go tool vet $(HTTP_FILES)
 
 
-$(WEBAPP):
+$(WEBAPP): $(WEBAPP_FILES) $(HTTP_FILES) $(OSUTIL_FILES) $(POSTGRES_FILES)
 	go build -o $(WEBAPP) cmd/webapp/main.go
 
 $(WATCHER): $(TACITUS_FILES) $(OSUTIL_FILES) $(POSTGRES_FILES) \
-	$(GDAX_FILES) $(GDAX_WEBSOCKET_FILES)
-	go build -o $(WATCHER) cmd/watcher/main.go
+	$(GDAX_FILES) $(GDAX_WEBSOCKET_FILES) $(WATCHER_FILES)
+	go build -o $(WATCHER) $(WATCHER_FILES)
 
 clean:
 	-rm -f $(BUILD_DIR)/*
 
-.PHONEY: clean webapp watcher fmt
+.PHONEY: all clean webapp watcher fmt