diff --git a/.gitignore b/.gitignore
index 24e1eb1f5..62a33e91e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -89,7 +89,15 @@ buck-out/
 .buckd/
 
 #other
-/infer/bin
+/infer/bin/infer
+/infer/bin/infer.byte
+/infer/bin/infer.native
+/infer/bin/infer-analyze
+/infer/bin/infer-capture
+/infer/bin/infer-compile
+/infer/bin/infer-report
+/infer/bin/infer-reportdiff
+/infer/bin/infer-run
 /infer/man
 
 /infer/src/base/Version.ml
diff --git a/infer/src/Makefile b/infer/src/Makefile
index 8bede3015..0cb648a17 100644
--- a/infer/src/Makefile
+++ b/infer/src/Makefile
@@ -411,8 +411,10 @@ clean:
 	$(REMOVE) base/Version.ml.tmp.*
 	$(REMOVE) backend/jsonbug_{j,t}.ml{,i}
 	$(REMOVE) checkers/stacktree_{j,t}.ml{,i}
-	$(REMOVE) $(INFER_BIN){,.byte,.native} $(INFER_BIN_ALIASES)
-	$(REMOVE) $(INFERUNIT_BIN) $(CHECKCOPYRIGHT_BIN)
+#	be a bit more aggressive than needed with what we remove here so that stale binaries that
+#	only existed in previous versions get removed as well
+	$(REMOVE) $(BIN_DIR)/Infer* $(BIN_DIR)/infer-* $(INFER_BIN){,.byte,.native} $(INFER_BIN_ALIASES) \
+	  $(INFERUNIT_BIN) $(CHECKCOPYRIGHT_BIN)
 	$(REMOVE) $(CLANG_ATDGEN_STUBS)
 	$(REMOVE) $(INFER_CLANG_FCP_MIRRORED_FILES)
 	$(REMOVE) $(INFER_CREATE_TRACEVIEW_LINKS_BIN)