diff --git a/Makefile b/Makefile
index 23b663a..926dea3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,14 @@
-BINDATA=
+BINDATA_IGNORE = $(shell git ls-files -io --exclude-standard $< | sed 's/^/-ignore=/;s/[.]/[.]/g')
 
 dev: dev-assets
 	godep go build
 	@echo "You can now execute ./pgweb"
 
-assets:
-	go-bindata $(BINDATA) -ignore=\\.gitignore -ignore=\\.DS_Store -ignore=\\.gitkeep static/...
+assets: static/
+	go-bindata $(BINDATA_OPTS) $(BINDATA_IGNORE) -ignore=[.]gitignore -ignore=[.]gitkeep $<...
 
 dev-assets:
-	@$(MAKE) --no-print-directory assets BINDATA="-debug"
+	@$(MAKE) --no-print-directory assets BINDATA_OPTS="-debug"
 
 build: assets
 	gox -osarch="darwin/amd64 darwin/386 linux/amd64 linux/386 windows/amd64 windows/386" -output="./bin/pgweb_{{.OS}}_{{.Arch}}"