diff --git a/.gitignore b/.gitignore
index 776d7a2c9749474ff5daa02e3b6842d4c1d8a36d..541ad56b75c1ce20a60f2d1405ce069afb74e0e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
-bin/
+# css output
 static/*.css
+
+# bin output
+cerrado
diff --git a/Makefile b/Makefile
index c235179e4f8088760a7a6fc842a3c5a2814fa6d6..da2f09103e43dd1aef25f2f284ea1f806a3f0598 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,13 @@
 GIT_COMMIT 	?= $(shell git rev-parse --short HEAD)
 LDFLAGS 	:= "-X 'git.gabrielgio.me/cerrado/templates.Slug=.$(GIT_COMMIT)' -s -w"
+GO_SRC 		:= $(shell find . -name '*.go')
 
 BIN 	?= cerrado
 PREFIX 	?= /usr/local
 BINDIR 	?= $(PREFIX)/bin
 
 TEMPLATES_DIR 		:= templates
-TEMPLATES 			:= $(wildcard $(TEMPLATES_DIR)/*.qtpl)
+TEMPLATES			:= $(wildcard $(TEMPLATES_DIR)/*.qtpl)
 GO_TEMPLATES_FILES 	:= $(TEMPLATES:.qtpl=.qtpl.go)
 
 SASS_DIR 	:= scss
@@ -14,13 +15,13 @@ CSS_DIR 	:= static
 OUTPUT_CSS 	:= $(CSS_DIR)/main.$(GIT_COMMIT).css
 SASS_FILES 	:= $(wildcard $(SASS_DIR)/*.scss)
 
-build: sass tmpl
-	go build \
-		-ldflags=$(LDFLAGS) \
-		-o bin/$(BIN)
+build: $(BIN)
+
+$(BIN): $(GO_SRC) $(OUTPUT_CSS) $(GO_TEMPLATES_FILES)
+	go build -ldflags=$(LDFLAGS) -o $(BIN)
 
 install:
-	install -Dm755 bin/$(BIN) $(BINDIR)/$(BIN)
+	install -Dm755 $(BIN) $(BINDIR)/$(BIN)
 
 run: sass tmpl
 	go run .
@@ -40,7 +41,7 @@ $(TEMPLATES_DIR)/%.qtpl.go: $(TEMPLATES_DIR)/%.qtpl
 	qtc $(TEMPLATES_DIR)/$*.qtpl
 
 clean:
-	rm -f $(OUTPUT_CSS)
-	rm bin/$(BIN)
+	-rm $(OUTPUT_CSS)
+	-rm $(BIN)
 
 .PHONY: sass tmpl